Added some lifebar stuff.
LIFEBAAAAAR.
Merge branch 'master' into dev-scoring

Conflicts:
	src/ScreenGameplay7K.cpp