user alterado
Merge branch 'auth' into develop

Conflicts:
	portal/settings.py