ready for seeded data (sort of)
Merge branch 'davebranchv3'

Conflicts:
	app/models/survey_feedback.rb
dave version 3 merged
Merge branch 'master' of https://github.com/BioDigitalJazz/Ballotbox