Fix edit translation bug
Merge branch 'release-v1.2' of https://github.com/mnipper/rails_survey into release-v1.2
Add show instructions field to instruments model
Update model annotations
Fix merge conflict
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop