Merge branch 'devel' into feature/update-profile-in-oauth-flow

Conflicts:
	app/helpers/oauth_helper.rb
	app/views/doorkeeper/authorizations/new.html.erb
	spec/features/doorkeeper/oauth_spec.rb
	spec/support/page_objects/oauth2/authorization_page.rb