Users can now be used as login!
Merge branch 'dev' into james_branch_2

Conflicts:
	populator/User.py
Fixing bug with the login_enabled