VIVO-112: updates for educational training and awards
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf