details and some comments
Merge branch 'master' of https://github.com/wellincall/project-happiness

Conflicts:
	project_happiness/surveys/forms/form_answer_indooroutdoor.py
	project_happiness/surveys/models/location.py
	project_happiness/surveys/views.py
	project_happiness/templates/public_area/indooroutdoor.html