minor changes for cocos builder integration
Merge remote-tracking branch 'upstream/master'
Merge pull request #67 from funkaster/master

fixes for cocosbuilder