concluding merge
VIVO-395: modified css
Merge branch 'maint-rel-1.6' into develop