[Completes #66866102] Hidden password fix 'for User logging in with OpenID is required to agree to the Terms of Service'
[fixes #68301032] update scope description for email address
[#65697104] Fixes css display issue that hides 'Required' text in #66869056
[Completes #67939094] Limited Beta text on Sign In Page
Merge branch 'oauth_custom_text_per_app' into add_custom_text_to_apps-20140327

Conflicts:
	app/helpers/application_helper.rb
	app/views/apps/_form.html.haml
	app/views/users/sessions/new.html.haml
	db/schema.rb
	spec/requests/oauth_apps_spec.rb
[Completes #66866102] Fix for captcha not appearing on interstitial page when needed. (User logging in with OpenID is required to agree to the Terms of Service)
Merge pull request #42 from GSA/hidepass

[Completes #66866102] Hidden password & recaptcha fix 'for User logging in with Open...
Updating text version of notification emailer
Merge branch 'add_custom_text_to_apps-20140327'
[Completes #68020450] OnFocus/Blur coloring is reversed for text areas
Remove rb-readline which is no longer needed.

This was causeing errors in the console. Although the errors can be
fixed by removing the require statement*, I removed the gem entirely as
it is no longer directly needed by our app.

* https://github.com/luislavena/rb-readline/issues/93
Merge branch 'master' into xavier_merge_master_2014_04_06

Conflicts:
	app/controllers/users/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/views/users/registrations/new.html.haml
	app/views/users/sessions/new.html.haml
	spec/requests/authentications_spec.rb
Merge pull request #45 from GSA/xavier_merge_master_2014_04_06

Xavier merge master 2014 04 06