modified *.mk
testing
Merge branch 'develop' into module_adjust

Conflicts:
	quick/lib/lua_bindings/manual/CCLuaStack.cpp
Merge branch 'v3quick' into module_adjust
Merge branch 'v3quick' into module_adjust
modified .mk files for free type
Merge branch 'v3quick' into module_adjust
supported QUICK_NO_CURL
supported QUICK_NO_TIFF
Merge branch 'v3quick' into module_adjust
supported QUICK_NO_WEPP QUICK_NO_TGA QUICK_NO_PHYSICS
supported QUICK_NO_WEBSOCKET QUICK_NO_SQLITE QUICK_NO_JSON
fixed errors in make files
updated templates
Merge branch 'v3quick' into module_adjust
cleanup
Merge branch 'v3quick' of github.com:dualface/cocos2d-x into v3quick
Merge branch 'v3quick' of github.com:htlxyz/cocos2d-x into v3quick