Fixed menu items for teachers
Merge remote-tracking branch 'origin/holo' into holo