update to playable? almost
Merge branch 'master' of https://github.com/ruby-yacht/numberone

Conflicts:
	mayor.gmx/Configs/Default.config.gmx
	mayor.gmx/Configs/Default/Android/icons/icon170.png
	mayor.gmx/Configs/Default/Android/icons/icon36.png
	mayor.gmx/Configs/Default/Android/icons/icon48.png
	mayor.gmx/Configs/Default/Android/icons/icon72.png
	mayor.gmx/Configs/Default/Android/icons/ouyaIcon.png
	mayor.gmx/Configs/Default/Android/splash.png
	mayor.gmx/Configs/Default/Linux/icon64.png
	mayor.gmx/Configs/Default/Linux/splash.png
	mayor.gmx/Configs/Default/Mac/icon512.png
	mayor.gmx/Configs/Default/Mac/splash.png
	mayor.gmx/Configs/Default/Tizen/icon117.png
	mayor.gmx/Configs/Default/Tizen/splash.png
	mayor.gmx/Configs/Default/WinPhone/ApplicationIcon.png
	mayor.gmx/Configs/Default/WinPhone/CycleSmall.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide1.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide2.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide3.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide4.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide5.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide6.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide7.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide8.png
	mayor.gmx/Configs/Default/WinPhone/CycleWide9.png
	mayor.gmx/Configs/Default/WinPhone/FlipMedBack.png
	mayor.gmx/Configs/Default/WinPhone/FlipMedFront.png
	mayor.gmx/Configs/Default/WinPhone/FlipSmallBack.png
	mayor.gmx/Configs/Default/WinPhone/FlipSmallFront.png
	mayor.gmx/Configs/Default/WinPhone/FlipWideBack.png
	mayor.gmx/Configs/Default/WinPhone/FlipWideFront.png
	mayor.gmx/Configs/Default/WinPhone/IconicSmall.png
	mayor.gmx/Configs/Default/WinPhone/IconicWide.png
	mayor.gmx/Configs/Default/WinPhone/SplashScreenImage.jpg
	mayor.gmx/Configs/Default/WinPhone/SplashScreenImage480.jpg
	mayor.gmx/Configs/Default/WinPhone/SplashScreenImage720.jpg
	mayor.gmx/Configs/Default/Windows8/Win8NativeRunner_TemporaryKey.pfx
	mayor.gmx/Configs/Default/Windows8/Windows8_TemporaryKey.pfx
	mayor.gmx/Configs/Default/Windows8/logos/logo150.png
	mayor.gmx/Configs/Default/Windows8/logos/logo30.png
	mayor.gmx/Configs/Default/Windows8/logos/logo310.png
	mayor.gmx/Configs/Default/Windows8/logos/logo50.png
	mayor.gmx/Configs/Default/Windows8/splashscreen.png
	mayor.gmx/Configs/Default/html5/fav.ico
	mayor.gmx/Configs/Default/html5/splash.png
	mayor.gmx/Configs/Default/ios/iPadRetinaSplash.png
	mayor.gmx/Configs/Default/ios/iPadsplash.png
	mayor.gmx/Configs/Default/ios/iPhone5splash.png
	mayor.gmx/Configs/Default/ios/iPhoneRetinasplash.png
	mayor.gmx/Configs/Default/ios/iPhonesplash.png
	mayor.gmx/Configs/Default/ios/icons/icon114.png
	mayor.gmx/Configs/Default/ios/icons/icon120.png
	mayor.gmx/Configs/Default/ios/icons/icon144.png
	mayor.gmx/Configs/Default/ios/icons/icon152.png
	mayor.gmx/Configs/Default/ios/icons/icon57.png
	mayor.gmx/Configs/Default/ios/icons/icon72.png
	mayor.gmx/Configs/Default/ios/icons/icon76.png
	mayor.gmx/Configs/Default/ios/splash.png
	mayor.gmx/Configs/Default/windows/License.txt
	mayor.gmx/Configs/Default/windows/RunnerInstaller.nsi
	mayor.gmx/Configs/Default/windows/Runner_Icon_256.ico
	mayor.gmx/Configs/Default/windows/Runner_finish.bmp
	mayor.gmx/Configs/Default/windows/Runner_header.bmp
	mayor.gmx/Configs/Default/windows/runner_icon.ico
	mayor.gmx/Configs/Default/windows/splash.png
	mayor.gmx/help.rtf
	mayor.gmx/mayor.project.gmx
	mayor.gmx/objects/obj_actor.object.gmx
	mayor.gmx/objects/obj_doctor.object.gmx
	mayor.gmx/objects/obj_mayor.object.gmx
	mayor.gmx/rooms/room0.room.gmx
	mayor.gmx/sprites/images/spr_actor_0.png
	mayor.gmx/sprites/images/spr_doctor_0.png
	mayor.gmx/sprites/images/spr_lawyer_0.png
	mayor.gmx/sprites/images/spr_mayor_0.png
	mayor.gmx/sprites/spr_actor.sprite.gmx
	mayor.gmx/sprites/spr_doctor.sprite.gmx
	mayor.gmx/sprites/spr_lawyer.sprite.gmx
	mayor.gmx/sprites/spr_mayor.sprite.gmx