2048 youhua
Merge branch 'whedevelop' of https://github.com/wanghehacker/quick-cocos2d-x into whedevelop