Fixes #165.
Fixes 154.
Fixes #153.
Fixes #153.
Should fix #155.
Merge branch 'master' of github.com:point97/survey-demo

Conflicts:
	server/templates/registration/registration_form.html