fixed survey relationship
fixed merge conflict in survey controller
fixed merge conflict Merge branch 'master' of https:/thub.com/tlands/survey_gorilla