Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj.
Updating the template of multi-platform-js for win32.
Updating multi-platform templates.
Removing unused codes.
Merge https://github.com/dumganhar/cocos2d-x into test-damganhar
Merge pull request #2230 from dumganhar/master

Updating the template of multi-platform.
fix some bugs when creating android project with multi-platform tool
Merge pull request #2232 from minggo/test-damganhar

fix some bugs when creating android project
[VS2012] Adding dependence for AssetsMangerTest.
Merge pull request #2233 from dumganhar/master

[VS2012] Adding dependence for AssetsMangerTest.
Fixing memoryleaks.
Merge pull request #2234 from dumganhar/memory-leak

Fixing memoryleaks.
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
Merge pull request #2236 from minggo/iss1848-pvrtc

use CCConfiguration::supportsPVRTC() to determine if the device supports pvrtc format
Merge remote-tracking branch 'upstream/master'