sprite lamp (works on iOS mac and android)
update spine runtime and test case
spine runs on android platform
spine runs on android platform
spine linux works now
spine works on windows now
Merge branch 'v3' into v3_updateSpine

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
lua compiles ok－need to make it works later
Update CMakeLists.txt

added iOS/Mac
CMake fix for template projects
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/iSevenDays/cocos2d-x into v3
revert default settings
small fix
small comment fix
Update CMakeLists.txt
remove UIWebView.cpp in win32
Merge branch 'v3' into v3_updateSpine

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
[AUTO][ci skip]: updating cocos2dx_files.json
change camera operation