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

Conflicts:
	favor/favor/__init__.pyc
	favor/favor/settings.pyc
	favor/favor/urls.py
	favor/favor/urls.pyc
	favor/favor/wsgi.pyc
	favor/registro_usuarios/__init__.pyc
	favor/registro_usuarios/admin.pyc
	favor/registro_usuarios/forms.pyc
	favor/registro_usuarios/templates/registroUsuario.html
	favor/registro_usuarios/views.py
	favor/registro_usuarios/views.pyc
	favor/votos/__init__.pyc
	favor/votos/admin.pyc
	favor/votos/models.pyc
commit 33

Signed-off-by:  <>