Tooltips for health and energy bars were added
Merge remote-tracking branch 'origin/master'