Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into survey-fix
Fixing survey data classes to match JSON serialization through controller
Get rid of janky map and use Jackson's built-in subtyping mechanisms
OCD fix of line wrapping
Renaming test
Fixing issue with type property being lost on serialization
Must also have consented
Merge pull request #261 from alxdarksage/survey-fix

Survey fix