Changes to rearrange properties in the VIVO interface — both ordering and property group membership
VIVO-555
Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6
VIVO-573
Merge branch 'maint-rel-1.6' into develop