Merge branches 'master' and 'master' of https://github.com/waitingfy/FallMan
update to cocos2d-x 2.2.1