Merge branch 'devel' into feature/multiple-owner-ui

Conflicts:
	app/controllers/applications_controller.rb
	db/schema.rb
	spec/models/doorkeeper/application_spec.rb