VIVO-480 removing some obsolete URIs
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6
VIVO-461 new custom form, list view, etc for organization for training
Merge branch 'maint-rel-1.6' into develop