1. Minor changes to cater to smooth re-usage of home_rehab (Without having to quit and relaunch)
Merge remote-tracking branch 'Patient-Program/development' into development