Closed #3646: add Bake Layer tests to js-tests
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss3646_BakeNode
Merge pull request #490 from dingpinglv/Iss3646_BakeNode

Closed #3646: add Bake Layer tests to js-tests
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	frameworks/cocos2d-html5