models progress
Merge branch 'master' of https://github.com/wellincall/project-happiness

Conflicts:
	project_happiness/surveys/models.py
	project_happiness/surveys/models/__init__.py