got resource gathering working
Merge branch 'gamedesign-gathering' of https://github.com/Tadimsky/vooga into gamedesign-gathering

Conflicts:
	src/vooga/rts/controller/GameController.java
	src/vooga/rts/gamedesign/sprite/rtsprite/Resource.java
	src/vooga/rts/gamedesign/sprite/rtsprite/interactive/IGatherable.java
	src/vooga/rts/gamedesign/strategy/gatherstrategy/CanGather.java