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

Conflicts:
	Game2014/proj.android/bin/Game2014.apk
	Game2014/proj.android/bin/dexedLibs/annotations-c6da7ab612a48a149c7b735e691cc8b9.jar
	Game2014/proj.android/bin/resources.ap_
	Game2014/proj.android/libs/armeabi/libcocos2dcpp.so
	Game2014/proj.android/obj/local/armeabi/libcocos2d.a
	Game2014/proj.android/obj/local/armeabi/libcocos2dandroid.a
	Game2014/proj.android/obj/local/armeabi/libcocos2dcpp.so
	Game2014/proj.android/obj/local/armeabi/libcocosdenshion.a
Merge branch 'master' of https://github.com/ricky-flyguy/RMZ_2014