Merge branch 'BackToGabu'

Conflicts:
	.gitignore
	osx/AppFileStaging/Contents/Info.plist
	osx/ApplicationSupportBridge.h
	osx/SDLMain.mm
	src/FileFunctions.cpp