addtl refactors for manage users

Conflicts:
	DemoApplication/DemoApplication/DemoApplication.csproj
major design refactor