initial branch for org-man
user stuff
Merge branch 'master' into org-man

Conflicts:
	mods/management/index.js