added code for hearts and energy bar
Merge branch 'master' of https://github.com/thomas-burger/GameJam-15.2.2014

Conflicts:
	Assets/Character/CharacterData.cs
	Assets/GUI/InventoryGUI.cs
Merge branch 'master' of https://github.com/thomas-burger/GameJam-15.2.2014

Conflicts:
	Assets/Resources/heart.png.meta
	Assets/Resources/staff.png.meta
	Assets/Resources/sword.png.meta
changed heart
Merge branch 'master' of https://github.com/thomas-burger/GameJam-15.2.2014
scene change for merge