Adding health bars
Manual merge of dev_anpatel
Merge branch 'dev_anpatel' into dev_sramanujan