refactoring
Merge branch 'feature/add_classroom-57' into staging