fixed conflict in note viewer
Merge branch 'dev' of https://github.com/damouse/Glassroom-Server into dev