updated survey model to prepare for expanded query support
merged master and fixed survey implementation
fixed tests
Merge pull request #136 from sportngin/survey-update

Updated survey model for expanded query support