Update instrument versioning spec to reflect new instrument version logic
Add font path back to fontawesome
Stub current_project for version feature spec
Merge branch 'release-v1.1' of https://github.com/mnipper/rails_survey into release-v1.1
Merge branch 'release-v1.1' of https://github.com/mnipper/rails_survey into develop
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop