Change instrument_version to instrument for now in survey
Merge branch 'release-v1.2' of https://github.com/mnipper/rails_survey into release-v1.2