Merge branch 'OSXTest'

Conflicts:
	osx/SDLMain.mm
	osx/mli copy-Info.plist
	src/main.cpp