Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	frameworks/cocos2d-html5
	tools/cocos2d-console