fixed #1724: Moved HelloJavascript to template folder and renamed it with "multi-platform-is".
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1724-hellojs

Conflicts:
	template/multi-platform-js/proj.win32/HelloJavascript.vcxproj
issue #1724: Reverted vs solution.
Merge pull request #1992 from dumganhar/iss1724-hellojs

fixed #1724: Moved HelloJavascript to template folder and renamed it to "multi-platform-is".