Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop
remove duplicate ModalFormCtrl and update references to it as a string
a couple leftover references
start consolidating all modal forms to use global init_form now moved to MainController
BUGFIX: visit_type PUT wasn't working
finish modal consolidation for init_form