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

Conflicts:
	frameworks/runtime-src