Listo link hacia la pagina de encuestas
Link de encuestas casi listo
django-survey integrado
survey's basic functionality done.
Survey module ready
Database added
tar.gz c-nutra
Survey admin widget translated.
Merge branch 'django-survey-final' of github.com:dmallcott/C-Nutra into django-survey-final
Merge remote-tracking branch 'origin/django-survey-final'

Conflicts:
	c_nutra/apps/users/models.py
	c_nutra/config/settings/local.py
	c_nutra/config/urls.py
	c_nutra/templates/base.html

I had a hard time with the migrations so I had to drop the user profile table.
Everything is in order now.