run migration
fix rule sidebar highlighting bug, do not highlight if device user is selected
Merge branch 'master' of https://github.com/mnipper/rails_survey
migration
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop
Merge branch 'develop'