Updating the template of muti-platform-js.
Updating iOS Template.
Merge pull request #2141 from dumganhar/master

Updating the template of muti-platform-js and iOS template.
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x

Conflicts:
	template/multi-platform-js/Classes/AppDelegate.cpp
	template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj
	template/xcode4/lib_js.xctemplate/TemplateInfo.plist