Update submodules
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop

Conflicts:
	frameworks/cocos2d-html5
Merge pull request #706 from pandamicro/develop

Sync Master to Develop