Merge remote-tracking branch 'origin/oti-local'
Merge branch 'master' of github.com:OpenTreeOfLife/opentree
Merge branch 'master' of github.com:OpenTreeOfLife/opentree
Merge branch 'master' of github.com:OpenTreeOfLife/opentree
Misc. fixes for main study-tags UI