rollback
Merge branch 'ajax' of https://github.com/damouse/Glassroom-Server into ajax