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
Add a capybara test for OAuth deny flow
addessing changes per chris with doorkeeper
Merge branch 'devel' of github.com:18F/myusa-server into feature/scope-mockups
Merge branch 'devel' into feature/manage-profile
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
Add some technical info about MyUSA

Based on @yozlet's request, put what MyUSA is in addition to
what it does.
Add the fact that we're an account system

Yes, we manage accounts.  And you can log in a variety of ways.
Merge pull request #142 from 18F/hotfix/README

Add some technical info about MyUSA
adding fix for cancel form without css
making checkbox label clickable