div changes, fixed BS
Merge branch 'local' of https://github.com/damouse/Glassroom-Server into local