Fixed broken stuff and made loading screen init
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test/States/GameScreen.cs