Merge pull request #24 from cocos2d/master

update cocos2d-js
Merge pull request #25 from cocos2d/master

update cocos2d-js
add var to control  log output
modify MACOSX_DEPLOYMENT_TARGET
add template version
Merge pull request #26 from cocos2d/master

update cocos2d-js
add initView support
add ConfigParser
fixed Android
fixed mac error
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js

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

add custom screen design