Add basic multi-user support

Merged username-removed-26331 requested to merge grote/repomaker:multi-user into master Apr 25, 2017