Merge branch 'devel' into feature/manage-approved-apps

Conflicts:
    app/helpers/oauth_helper.rb
    app/views/doorkeeper/authorizations/new.html.erb
    config/locales/en.yml
    spec/support/page_objects/profile_page.rb