Health bars
Merge branch 'master' into click_interactions

Conflicts:
	game/classes/ui_class.lua