Merge branch 'refs/heads/master' into project-creator
Merge pull request #2011 from dumganhar/iss1733-hybrid

issue #1733: Updated hybrid lua template project.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into project-creator
issue #1733, unify package name to org.cocos2dx.hello* lower case on both android & ios.
issue #1733, improve the help description of create_project.py
Merge pull request #2014 from walzer/project-creator

unify package name to org.cocos2dx.hello* on both ios and android
fixed #1730: Binds CCScrollView and CCTableView to js.
Merge pull request #2015 from dumganhar/iss1730-bind-scrollview

fixed #1730: Exposed CCScrollView and CCTableView to js.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2016 from CocosRobot/updategeneratedsubmodule_1361413471

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
issue #1733: Updated multi-platform-lua/proj.android/build_native.sh.