move
Merge branch 'dualface_upgrade_2_2_3' into SimplePlayer

Conflicts:
	lib/cocos2d-x/cocos2dx/cocoa/CCScriptEventDispatcher.cpp