UserManagement Changes.
Merge remote-tracking branch 'origin/master' into jacob

Conflicts:
	Lyon/src/UserManagement.java