issue #2905:TestJavascript build ok on Android
Merge pull request #3961 from minggo/iss2905-adjust_folder

issue #2905:TestJavascript build ok on Android
Added missing icons for some iOS and Mac samples.
Merge pull request #3962 from dumganhar/develop

Added missing icons for some iOS and Mac samples.
issue #2905: jsbinding samples and lua binding samples build ok on android
Merge pull request #3964 from minggo/iss2905-adjust_folder

issue #2905: jsbinding samples and lua binding samples build ok on andro...
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop