Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop

# Conflicts:
#	extensions/ccui/uiwidgets/scroll-widget/UIPageView.js

Conflicts resolved.

Author: 1scaR1

Diff for: CCBoot.js

@@ -57,7 +57,7 @@ Cocos2d-x v3.7.1 @ August.12 2015
     [FIX]           web: Fixed Cocos Studio parser issue that all elements are missing while the timeline action contains rotation
 
 Cocos2d-x v3.7 Final @ July 20 2015
-    [REFINE]        web: Add compatible Uint16Array defintion
+    [REFINE]        web: Add compatible Uint16Array definition
 
     [FIX]           web: Fixed url check regular expression not supporting localhost issue
     [FIX]           web: Fixed issue that sprite doesn't update texture rect correctly 
@@ -200,7 +200,7 @@ Cocos2d-JS v3.5 @ April 1 2015
     8. Fixed a bug of Cocos Studio parser that the background color of `ccui.Layout` can't be parsed correctly.
     9. Fixed a bug of `cc.ClippingNode` that it doesn't work when set `inverted` to true in Canvas Mode.
     10. Fixed a bug of `ccs.Armature` that its name was modified to animation name when loading from json files.
-    11. Fixed a bug of `ccui.PageView` that it cancel child touch during movment of page view. 
+    11. Fixed a bug of `ccui.PageView` that it cancel child touch during movement of page view. 
     12. Fixed a bug of `cc.Scheduler` that its parameter `repeat` is invalid in schedule function.
     13. Fixed a bug of `cc.Scheduler` that `unschedule` function may fail.
 
@@ -363,7 +363,7 @@ Cocos2d-JS v3.2 RC0 @ Dec.11, 2014
 	6. Fixed an issue of `cc.ParticleSystem` that it can't change its texture mode and shape type in Canvas mode.
 	7. Fixed an issue of `cc.Layer`'s bake function that its position is incorrect when cc.view's scale isn't 1.
 	8. Fixed an issue of `ccs.ArmatureAnimation`'s `setMovementEventCallFunc` and `setFrameEventCallFunc`.
-	9. Fixed an issue of `console.log` that it isn't a funtion on IE9.
+	9. Fixed an issue of `console.log` that it isn't a function on IE9.
 	10. Fixed an issue of `CSLoader` that it will add duplicate resources to sprite frame cache.
 	11. Fixed an issue of `cc.ProgressTimer` that its setColor is not taking effect.
 	12. Fixed an issue of `cc.loader` that it will throw an error when loading a remote texture.

Diff for: CHANGELOG.txt

@@ -274,7 +274,7 @@ cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{
      * - The reversed action will be x of 100 move to 0.
      * - Will be rewritten
      *
-     * @return {Null}
+     * @return {?cc.Action}
      */
     reverse:function () {
         cc.log("cocos2d: FiniteTimeAction#reverse: Implement me");

Diff for: cocos2d/actions/CCAction.js

@@ -100,7 +100,7 @@ cc.ActionCamera = cc.ActionInterval.extend(/** @lends cc.ActionCamera# */{
      * - The action will be x coordinates of 0 move to 100. <br />
      * - The reversed action will be x of 100 move to 0.
      * - Will be rewritten
-     *
+     * @return {?cc.Action}
      */
     reverse:function () {
         return new cc.ReverseTime(this);

Diff for: cocos2d/actions/CCActionCamera.js

@@ -1140,7 +1140,7 @@ cc.EaseElastic = cc.ActionEase.extend(/** @lends cc.EaseElastic# */{
     /**
      * Create a action. Opposite with the original motion trajectory. <br />
      * Will be overwrite.
-     * @return {null}
+     * @return {?cc.Action}
      */
     reverse:function () {
         cc.log("cc.EaseElastic.reverse(): it should be overridden in subclass.");
@@ -1770,7 +1770,7 @@ cc.easeBounceOut = function(){
 
 /**
  * cc.EaseBounceInOut action. <br />
- * Eased bounce effect at the begining and ending.
+ * Eased bounce effect at the beginning and ending.
  * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  * @class
  * @extends cc.EaseBounce
@@ -1823,7 +1823,7 @@ cc.EaseBounceInOut = cc.EaseBounce.extend(/** @lends cc.EaseBounceInOut# */{
 
 /**
  * Creates the action. <br />
- * Eased bounce effect at the begining and ending.
+ * Eased bounce effect at the beginning and ending.
  * @static
  * @deprecated since v3.0 <br /> Please use action.easing(cc.easeBounceInOut())
  * @param {cc.ActionInterval} action
@@ -1857,7 +1857,7 @@ cc._easeBounceInOutObj = {
 
 /**
  * Creates the action easing object. <br />
- * Eased bounce effect at the begining and ending.
+ * Eased bounce effect at the beginning and ending.
  * @function
  * @return {Object}
  * @example
@@ -2050,7 +2050,7 @@ cc.easeBackOut = function(){
 
 /**
  * cc.EaseBackInOut action. <br />
- * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
+ * Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
  * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  * @class
  * @extends cc.ActionEase
@@ -2104,7 +2104,7 @@ cc.EaseBackInOut = cc.ActionEase.extend(/** @lends cc.EaseBackInOut# */{
 
 /**
  * Creates the action. <br />
- * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
+ * Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
  * @static
  * @param {cc.ActionInterval} action
  * @return {cc.EaseBackInOut}
@@ -2139,7 +2139,7 @@ cc._easeBackInOutObj = {
 
 /**
  * Creates the action easing object. <br />
- * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut.
+ * Beginning of cc.EaseBackIn. Ending of cc.EaseBackOut.
  * @function
  * @return {Object}
  * @example
@@ -3678,4 +3678,3 @@ cc._easeCubicActionInOut = {
 cc.easeCubicActionInOut = function(){
     return cc._easeCubicActionInOut;
 };
-

Diff for: cocos2d/actions/CCActionEase.js

@@ -208,7 +208,7 @@ cc.ActionInterval = cc.FiniteTimeAction.extend(/** @lends cc.ActionInterval# */{
      * returns a reversed action. <br />
      * Will be overwrite.
      *
-     * @return {null}
+     * @return {?cc.Action}
      */
     reverse:function () {
         cc.log("cc.IntervalAction: reverse not implemented.");
@@ -1121,6 +1121,7 @@ cc.RotateTo = cc.ActionInterval.extend(/** @lends cc.RotateTo# */{
     /**
      * RotateTo reverse not implemented.
      * Will be overridden.
+     * @returns {cc.Action}
      */
     reverse:function () {
         cc.log("cc.RotateTo.reverse(): it should be overridden in subclass.");

Diff for: cocos2d/actions/CCActionInterval.js

@@ -56,7 +56,7 @@ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{
      * to copy object with deep copy.
      * returns a clone of action.
      *
-     * @return {cc.Action}
+     * @return {cc.ActionInterval}
      */
     clone:function(){
         var action = new cc.GridAction();