[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
Merge branch 'add_custom_text_to_apps-20140327'
[Completes #68020450] OnFocus/Blur coloring is reversed for text areas
WIP: need to fix error w/encrypted booleans.
set marshaling config even though it should be set to true by default.