Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop
pagination
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop