no message
Merge branch 'master' of https://github.com/ricky-flyguy/RMZ_2014

Conflicts:
	Game2014/cocos2d/cocos/2d/platform/android/java/bin/classes/org/cocos2dx/lib/Cocos2dxBitmap.class
	Game2014/cocos2d/cocos/2d/platform/android/java/bin/classes/org/cocos2dx/lib/Cocos2dxSound$OnLoadCompletedListener.class
	Game2014/cocos2d/cocos/2d/platform/android/java/bin/classes/org/cocos2dx/lib/Cocos2dxSound.class
	Game2014/cocos2d/cocos/2d/platform/android/java/bin/classes/org/cocos2dx/lib/Cocos2dxTextInputWraper.class