VIVO-376 picklist sorting
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop