Merge pull request #1456 from dingpinglv/DevelopToMaster

tag Cocos2d-html5 v2.2.2
Merge pull request #1462 from dingpinglv/DevelopToMaster

tag Cocos2d-html5 v2.2.2
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0
issue #3945: Refactor cc.p/cc.size/cc.rect
issue #3945 Refactor basic constant color
issue #3945 Refactor cc.Color4B to cc.Color
issue #3935 Refactor CCGame to run game.
issue #3935 Refactor CCGame to run game.
issue #3945 Refactor cc.Color4F to cc.Color
Merger
issue #3945: update ignore
Refactor #3878: Fix bug of CCLoader
Refactor #3935: Refactor CCGame to run game.
Refactor #3935: Refactor CCGame to run game.
Merge pull request #1585 from SmallAiTT/CCGame_dev3.0

issue #3935 Refactor CCGame to run game.
Merge branch 'gettersetter' into develop-3.0

* gettersetter:
  Refactor #3878: Fix bug of CCLoader
issue #3945: Refactor cc.Color3B to cc.Color
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0

# By SmallJun
# Via SmallJun (2) and dingpinglv (2)
* 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5:
  Refactor #3935: Refactor CCGame to run game.
  issue #3935 Refactor CCGame to run game.
  issue #3935 Refactor CCGame to run game.

Conflicts:
	cocos2d/core/CCLoader.js
Feature #3940: Fix bug of Getter/Setter in CCTexture2D
Merge pull request #1586 from pandamicro/develop-3.0

Feature #3940: Fix bug of Getter/Setter in CCTexture2D