Merge pull request #195 from alxdarksage/survey-controller

Survey questions elaborated
Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into survey-controller
Adding test for survey serialization round-trip