Merge branch 'master' of https://github.com/topahl/die-Strasse.git

Conflicts:
	main/TheStreet/bin/com/stalkindustries/main/game/GUILayer.class
	main/TheStreet/bin/com/stalkindustries/main/game/Simulation.class
	main/TheStreet/src/com/stalkindustries/main/game/GUILayer.java
Backup

Change-Id: Id55db5bff62b9437f5a28018fcdf513f79e42ed1
Signed-off-by: Martika <Martika@MC2>