add login functionality
Merge branch 'master' of https://github.com/teamreactive/swap

Conflicts:
	genericusers/urls.py
	genericusers/views.py
	swap/urls.py