merge to cocos2dx 2.2.1

1 win32 version runnable.