fixed typo
Removed three games and added Simulator link to index page.
Merge pull request #1295 from dingpinglv/DevelopToMaster

Push developer branch to master branch
Merge pull request #1 from cocos2d/develop

Pull down updates from cocos2d:develop
Merge pull request #2 from cocos2d/develop

Pull down updates from cocos2d:develop
Closed #3171: add a log informations to notice to developers that they forgot to preload plist file.
Merge pull request #1307 from dingpinglv/Iss3171_AddLogInfoToSAXParser

Closed #3171: add a log informations to notice to developers that they forgot to preload plist file.
closed #3349: add ClippingNode for canvas mode
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_eglvew
Closed #3369 : Rewrite logic of NO_BORDER adaptation
issue #3349: add ClippingNode for canvas mode
issue #3349: add ClippingNode for canvas mode
Merge pull request #1308 from xingsenma/develop_clipping

closed #3349: add ClippingNode for canvas mode
Merge pull request #1309 from pandamicro/develop

Closed #3369 : Rewrite logic of NO_BORDER adaptation
Fixed #3373 : Add verification to audio duration to prevent issue
Fixed #3373 : change methode of verification to audio duration
Merge pull request #1310 from pandamicro/develop

Fixed #3373 : Add verification to audio duration to prevent issue
Fixed #3116: fixed xxxRGBA's bugs
closed #3377: fix a bug that _displayedColor and _realColor use the same Pointer when compile single js file
Merge pull request #1311 from xingsenma/develop

closed #3377: fix a bug that _displayedColor and _realColor use the same Pointer when compile single js file