fazendo login
Merge branch 'master' of https://github.com/GokuITA/SuperAmigos

Conflicts:
	commerce/models.pyc
	commerce/views.py