fixed build mode and shop
Merge branch 'towerdefense' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense

Conflicts:
	src/vooga/towerdefense/action/AttackAction.java
	src/vooga/towerdefense/controller/Controller.java
	src/vooga/towerdefense/factories/ProjectileFactory.java
	src/vooga/towerdefense/factories/WaveFactory.java
	src/vooga/towerdefense/gameElements/Wave.java
	src/vooga/towerdefense/view/gamescreens/MapScreen.java