Fixes issues with Insert/Update buttons
Fix sql error
Merge branch 'develop' into KwaMoja-Medical