Commit 6
Merge branch 'master' of https://github.com/gianpaima/favorless

Conflicts:
	favor/favor/urls.pyc
	favor/registro_usuarios/forms.pyc
	favor/registro_usuarios/models.pyc
	favor/registro_usuarios/templates/principal.html
	favor/registro_usuarios/views.py
	favor/registro_usuarios/views.pyc