contrib app
login
Merge remote-tracking branch 'origin/master'
login and logout added
Merge remote-tracking branch 'origin/master'

Conflicts:
	sales/views.py