Login completo
Merge remote-tracking branch 'origin/master'

Conflicts:
	ttr/ttr_app/views.py