upgrade icons
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Assets/Prefabs/PlaceholderUnits/HeavyUnit1.prefab
	HeartGame/Assets/Prefabs/PlaceholderUnits/RegularUnit.prefab
	HeartGame/Assets/Prefabs/PlaceholderUnits/ScatterUnit1.prefab
	HeartGame/HeartGame.userprefs
	HeartGame/Library/assetDatabase3
	HeartGame/Library/expandedItems
	HeartGame/Library/metadata/72/72a88360f5974ac48968054886c2f0fe