test
New graphics
Merge branch 'master' into gui-rewrite

Conflicts:
	other games