refactoring survey helper
fix seed file
fix merge conflict
refactor survey_helper
fix seed file
Merge branch 'sctrl'