Added health and mana displays
Added entity health
Merge branch 'master' of http://github.com/Antag99/aquarria