fixed a few things
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign

Conflicts:
	src/vooga/rts/gamedesign/strategy/occupystrategy/OccupyStrategy.java