Beginning to merge the user list into the editor. Git is forcing me to check in to get latest. Bad Git.
Merge branch 'master' of https://github.com/Molitov/collab-edit
Fixes to display the user list on the editor page.
Merge branch 'master' of https://github.com/Molitov/collab-edit

Conflicts:
	models/routeManager.js