Merged master and manage-users—implements unpolished co-editor feature

Remember to include new CSS for /sass branch.