OK
Merge branch 'whedevelopqt' of https://github.com/wanghehacker/quick-cocos2d-x into whedevelopqt

Conflicts:
	bin/cube2048/google-play-services_lib/bin/google-play-services_lib.jar
	bin/cube2048/proj.android/2048Classic.apk
360complete