Add user from factory to admin role by default
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop