set user default role
merge
Merge branch 'master' into develop
merge develop with remote branch
Merge branch 'release-v1.3' of https://github.com/mnipper/rails_survey into release-v1.3
migration