Removed a bug that was causing endless loop when updating encounters
Merge branch 'development' of github.com:BaobabHealthTrust/mnch-hotline into development