integrating v1 mockups for user selected scopes
changing header styling
Merge branch 'devel' into feature/scope-mockups

Conflicts:
	app/views/oauth/authorize.html.erb
	spec/features/oauth_apps_spec.rb
Design for issue #72

User can update profile attributes during app approval
Merge branch 'devel' into feature/scope-mockups

Conflicts:
	spec/features/oauth_apps_spec.rb
addessing changes per chris with doorkeeper
Merge branch 'devel' of github.com:18F/myusa-server into feature/scope-mockups
Expanding en.yml to include profile lables, placeholders, and hints
Merge branch 'feature/scope-mockups' of github.com:18F/myusa-server into feature/scope-mockups
fixing test failures
Merge branch 'feature/scope-mockups' of github.com:18F/myusa-server into feature/scope-mockups
breaking cancel into separate form
fixing no thanks on separate line
adding fix for cancel form without css
making checkbox label clickable
moving fonts to theme and changing tabs to spaces
Create helper for OAuth deny link

Helper creates a link that will send user back to calling app with access_denied. There is a little bit of hackery to support non-redirectable redirect_uri's ... that's to support the native_uri concept that Doorkeeper uses for testing. Specifically, that style of redirect link will send user to our deny route, which will render JSON. The main downside here is that it uses some Rails trickery to create a link that uses HTTP DELETE.
fixing html semantics
Merge branch 'feature/scope-mockups' into feature/oauth_deny_link

Conflicts:
	app/views/doorkeeper/authorizations/new.html.erb
Merge branch 'feature/oauth_deny_link' into feature/scope-mockups