Merge branch 'v3quick' of github.com:dualface/cocos2d-x into v3quick
modify httprequestandroid
Merge branch 'v3quick' of github.com:htlxyz/cocos2d-x into v3quick

Conflicts:
	quick/lib/extra/Android.mk