smarter script for creating android project
clear
add copying of the java library
debug script modified
Adding missing include in ZipUtils.h.
not copy the java lib
Merge branch 'develop' of z:/Project/cocos2d-x into develop
[WIN32] NULL --> nullptr for CCLayer.cpp.
[WIN32] class Action : public Object, public Clonable  --> class Action : public Clonable, public Object
Merge pull request #2946 from dumganhar/develop

Compilation Fixes for WIN32
Bug fixes for the tool to generate luabindings.
Merge pull request #2947 from pyrasis/tizen_2.1

[Tizen] Fix compile error
Merge pull request #2949 from dumganhar/develop

Bug fixes for the tool to generate luabindings.
issue #2129: Removing CC prefix for template.
Merge pull request #2953 from dumganhar/develop

issue #2129: Removing CC prefix for template.
issue #2276: Add ScrollView lua binding and test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
fixed #2315: [JSB] Iterating through cc.Node children causes crash.
Merge pull request #2954 from dumganhar/develop

closed #2315: [JSB] Iterating through cc.Node children causes crash.
[NaCl] Fix sigslot.h compilation on NaCl ARM