Merge pull request #35 from nairys/new_survey

new surveys are functional
Fixed add a new choice
Resolved JS and View merge issues
Merge pull request #36 from nairys/Fixed_add_new_choice

Fixed add a new choice