Merge branch 'master' into gui-rewrite

Conflicts:
	other games
For some reason this file had conflicts, so I will delete it and add it later

Conflicts:
	other games