Merge branch 'devel' into feature/api-key-generation

Resolve minor conflicts:
	app/controllers/oauth/applications_controller.rb
	lib/doorkeeper_patches.rb
Merge pull request #257 from 18F/feature/api-key-generation

Feature/api key generation
Merge branch 'devel' into feature/make-public