fix teachers/ visitors
Merge remote-tracking branch 'upstream/master' into feature/hiro-project