Login created
Model viewset factory created
Merge branch 'master' of https://github.com/technomaniac/nuvo_qc

Conflicts:
	apps/user/__init__.py
	apps/user/forms.py
	apps/user/models.py
	apps/user/tests.py
	apps/user/urls.py
	apps/user/views.py
	apps/userlogin/__init__.py
	apps/userlogin/forms.py
	apps/userlogin/models.py
	apps/userlogin/tests.py
	apps/userlogin/urls.py
	apps/userlogin/views.py
	apps/users/__init__.py
	apps/users/forms.py
	apps/users/models.py
	apps/users/tests.py
	apps/users/urls.py
	apps/users/views.py
	requirements.txt
	templates/user/login_form.html