Merge pull request #34 from damouse/ajax

Ajax
fixed conflict in note viewer
Merge branch 'dev' of https://github.com/damouse/Glassroom-Server into dev
Merge pull request #35 from damouse/ajax

Dev
changed user login to email instead of id
stupid temporary merge- public folder complaining
merge fix, had to add temp classes
misc
Merge branch 'master' into dev
notes and images intersortable