New HUD elements
map work
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Library/InspectorExpandedItems.asset
	HeartGame/Library/assetDatabase3
	HeartGame/Library/guidmapper
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Assets/Prefabs/PlaceholderUnits/SleightUnit1.prefab
	HeartGame/HeartGame.userprefs
	HeartGame/Library/assetDatabase3
	HeartGame/Library/metadata/88/8882c12f450eba244b48e0bafeb37b1b
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Library/metadata/40/404fc1bf715e6584b8cb9b90cab4c93c