test
Merge branch 'master' of https://github.com/joshuastray/Cocos2d-JS-Support