Manually merged changes from (new-steve-brance)

DID: Merged in changes manually from new-steve-brance.
NEED: Game is broken - can't place towers.