GUI
Merge branch 'master' of https://github.com/heptan/Saruman_TD

Conflicts:
	proto/src/proto/Constants.java
	proto/src/proto/GameTimer.java
	proto/src/proto/GuiManager.java
Merge branch 'master' of https://github.com/heptan/Saruman_TD
GUI