Add buttons
Merge branch 'master' of github.com:albinodervall/RTS

Conflicts:
	src/main/Game.java
	src/main/MainState.java
	src/main/RTS.java
	src/state/TestState.java