Feature #5929: Refactor moon warriors with require.js
Merge branch 'require' of https://github.com/pandamicro/cocos2d-js into require

Conflicts:
	frameworks/cocos2d-html5
	samples/js-moonwarriors/main.js
	samples/js-moonwarriors/src/AboutLayer.js
	samples/js-moonwarriors/src/Background.js
	samples/js-moonwarriors/src/Bullet.js
	samples/js-moonwarriors/src/Effect.js
	samples/js-moonwarriors/src/Enemy.js
	samples/js-moonwarriors/src/GameControlMenu.js
	samples/js-moonwarriors/src/GameLayer.js
	samples/js-moonwarriors/src/GameOver.js
	samples/js-moonwarriors/src/LevelManager.js
	samples/js-moonwarriors/src/SettingsLayer.js
	samples/js-moonwarriors/src/Ship.js
	samples/js-moonwarriors/src/SparkEffect.js
	samples/js-moonwarriors/src/SysMenu.js
	samples/js-moonwarriors/src/config/GameConfig.js
update js-moonwarriors , support requirejs
support loop require
Merge pull request #12 from jianglong0156/require

Require
Revert "Require"
Merge pull request #13 from pandamicro/revert-12-require

Revert "Require"
Fixed #5990: Facebook SDK Test moved to main menu
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge branch 'develop' of https://github.com/pandamicro/cocos2d-js into develop
Fixed #5990: Arrange platform detection in tests-main.js
Issue #5981: Sync the latest build
Merge branches 'develop' and 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #852 from pandamicro/develop

Fixed #5990: Facebook SDK Test moved to main menu and bug fixes