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 #4 from cocos2d/develop

Merge from trunk
Merge pull request #1318 from xingsenma/develop

closed #3386 add async image load for cocostudio
Fixed #3373 : change methode of verification to audio (more secure)
Fixed #3406 : Change the position logic of canvas on SHOW_ALL mode

In addition:
Automatically add viewport metas into user’s custom setting. To avoid
viewport rescale problem by user input.
Merge pull request #1319 from pandamicro/develop

Fixed #3406 : Change the position logic of canvas on SHOW_ALL mode
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop
Fixed #3416 : Correct the transform matrix calculation for canvas in CCArmature
Merge pull request #1320 from pandamicro/develop

Fixed #3416 : Correct the nodeToParentTransformCanvas in CCArmature
Closed #3371: adding cc._PointConst and cc._SizeConst to engine for better Performance.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3371_xxxConst

Conflicts:
	extensions/CocoStudio/GUI/UIWidgets/UIButton.js
	extensions/CocoStudio/GUI/UIWidgets/UIImageView.js
	extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.js
	extensions/CocoStudio/GUI/UIWidgets/UISlider.js
	extensions/GUI/CCControlExtension/CCControlSwitch.js
Fixed #3371: remove "ie" from cc.Browser.webglWhiteList
issue #3419 add play several movement for armature
issue #3419 add changeDisplayByName for bone
issue #3419 refactor callMovementEvent
Issue #3433: refactoring setContentSize to support two types of Parameters
Issue #3433: refactoring setAnchorPoint to support two types of parameters
Issue #3433: replace setAnchorPoint(cc.p(x,y)) to setAnchorPoint(x,y)