Query options on edit question event
Merge branch 'release-v1.1' of https://github.com/mnipper/rails_survey into develop