Added login
Merge branch 'master' of github.com:manelore/tts
Merge branch 'master' of github.com:manelore/tts

Conflicts:
	tts/accounts/migrations/0001_initial.py
	tts/accounts/migrations/0002_auto__add_field_department_name.py