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