android prebuilt
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
modify template to 1.2
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge pull request #49 from chuanweizhang2013/master

update template version