Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
show tips while launch app
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
modify resource to binary file
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge pull request #36 from cocos2d/master

update js
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
runtime
add runtime data .h
Merge pull request #37 from chuanweizhang2013/master

convert resource to binary
modify template json
Merge pull request #38 from chuanweizhang2013/master

modify template json
modify update
modify play
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js

Conflicts:
	templates/js-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
Merge pull request #39 from chuanweizhang2013/master

modify play button
modify play action
fix can`t debug vs project normally
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
fix logic err