Realigning encounters
Merge branch 'development' of github.com:BaobabHealthTrust/HTC_Module into development