some TODO's
google analytics
Merge branch 'fix-classroom' into develop