user management part 1
Merge branch 'master' of github.com:halmayne/chumpr

Conflicts:
	src/contextManager.js