modified Macros's name
modified Macros's name
cleanup
cleanup
Merge branch 'v3quick' into develop

Conflicts:
	quick/lib/extra/Android.mk
	quick/lib/extra/luabinding/cocos2dx_extra_luabinding.cpp
	quick/lib/extra/network/CCNetwork.cpp
updated projects and template