problem with line end character
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
vivo-608 only display classes that are part of classgroup in type dropdown
Merge branch 'maint-rel-1.6' into develop