fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game++ Tile/res/gui.png