Popup fixes, colors look better, continuing to debug reset.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/infrastructure/GameMap.java
	src/infrastructure/GameWorld.java