added stacking (may be full of errors)
Merge remote branch 'origin/master'
added options[]
Merge remote branch 'origin/master'
clicked()
Merge remote branch 'origin/master'

Conflicts:
	Game Commons/src/de/gymdon/inf1315/game/Building.java
	Game Commons/src/de/gymdon/inf1315/game/GameMechanics.java
	Game Commons/src/de/gymdon/inf1315/game/GameObject.java
	Game Commons/src/de/gymdon/inf1315/game/Unit.java
Merge remote branch 'origin/master'