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

Conflicts:
	Game2014/proj.android/bin/Game2014.apk
	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/libcocos2dcpp.so
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/AppDelegate.o
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/AppDelegate.o.d
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/Balloon.o
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/HelloWorldScene.o
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/HelloWorldScene.o.d
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/MainMenu.o
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/MainMenu.o.d
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PullIndicator.o
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Classes/PullIndicator.o.d
	Game2014/proj.android/obj/local/armeabi/objs/cocos2dx_static/__/base/CCGeometry.o
	Game2014/proj.ios_mac/Game2014.xcodeproj/project.pbxproj
	Game2014/proj.ios_mac/Game2014.xcodeproj/project.xcworkspace/xcuserdata/phantomjr2.xcuserdatad/UserInterfaceState.xcuserstate
	Game2014/proj.ios_mac/ios/AppController.mm