Fix:Resolve the release lua test sample compile error
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
issue #3401: add physics lua auto generate to android.mk
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
Merge pull request #4939 from nutty898/develop_nutty_modify_framework_removeuselesssample

Develop nutty modify framework removeuselesssample
Merge pull request #4941 from samuele3hu/developNewUI

Fix:Resolve the release version of lua test sample compile error
Updates JS-Tests submodule.
Merge pull request #4930 from Dhilan007/develop_crash

fix error for load spriteFrames from plist in CCAnimationCache class.
Merge pull request #4942 from Dhilan007/develop_submodule

Updates JS-Tests submodule.
issue #3401: update cmake project set
update copyrights for 2014, in cocos/2d/ folder
[AUTO] : updating submodule reference to latest autogenerated bindings
Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt.
Simplifies linux template, build.sh is not needed now.
Renames title names for cpp and lua templates.
Deletes unused Makefile for linux.
fix label fnt bug for wrong shader
[travis] builds linux template now.
Merge pull request #4945 from dabingnn/develop_label_shaderBug

fix label fnt bug for wrong shader