trap placement and purchases

boobies
Merge branch 'development' of https://github.com/SMUDFS/springb2014 into development

Conflicts:
	GameMakerTycoon/Assets/HungerGamesMap.cs
	GameMakerTycoon/Assets/Scenes/test_ui.unity
	GameMakerTycoon/Assets/Traps/ArrowTrap.prefab
	GameMakerTycoon/Assets/Traps/Bomb.prefab
	GameMakerTycoon/Assets/Traps/FireTrap.prefab
	GameMakerTycoon/GameMakerTycoon.userprefs