still rebasing.
resolved merge conflit in surveys_controller. Moved survey_builder to helpers.
committing to rebase
Merge pull request #6 from jlscott2005/calder_tony_frontend

Calder tony frontend