Merge branch 'master' of https://github.com/GabuEx/my-little-investigations into BackToGabu

Conflicts:
	osx/SDLMain.mm
	src/FileFunctions.cpp
Merge branch 'BackToGabu'