Conflicts:
	resources/static/test/testHelpers/helpers.js

Fix the flashes that occur when verifying an email address.

* Only show info once the account has been verified.
* Unify the styles for the "has this address already been registered" error.
* Remove all the dead code that was left over from issue #1000 merge.

issue #1734

in the communication iframe, initialize ALL local storage values immedia...

This is a nice solution to a terrible browser bug.  r+

close #1637

Only allow siteLogo's to be served from https RPs.

issue #1761

in the communication iframe, initialize ALL local storage values immediately at startup to fix IE8 localStorage sync problems.  issue #1637

remove dead, untested code - retrieveTemporaryKeypair and storeTemporary...

r+ - This code hasn't been used in a long long time.  Thanks for the cleanup!

remove dead, untested code - retrieveTemporaryKeypair and storeTemporaryKeypair are referenced nowhere, have no tests, and were introduced in sept 8th 2011.  they should be removed.

* Reduce the number of places where the TOS/PP agreements are shown.
* Commenting the holes in coverage for required_email.

update BrowserID to Persona in the prove_template email signature - not final but now it is less confusing and matches the url and from address

Run images through PageSpeed's lossless image compressor to shrink them.

* Rename tosURL/privacyURL to termsOfService and privacyPolicy universally.
* Clean up styles as Skinny suggests.
* Remove dead code from pick_email.js

issue #1240

Show the BrowserID and RP TOS/PP at the correct time with the correct text.

* BID TOS/PP is only displayed to new users.
* RP TOS/PP is only displayed to new users, or users who have not been to a site before.

Details:
* Bring over rp_info.js from another branch. Module charged with displaying RP related info.
* In authenticate, add_email, and pick_email controllers, trigger message to update "next" button text to be correct for the particular screen.
* To dom-jquery, add hide and show functions.

Call controllers that need to display the TOS/PP info with siteTOSPP parameter.  This reduces the amount of data that needs to be passed around.

issue #1240

remove redirects for /manage, /users and /primaries - closes #1248

Change browserid.org urls to persona.org, introduce static.login.persona...

fix the fragile static-resource-test - when adding keys to lib/static_resources.js all indexes get shuffled.  broken with addition of relay.js.

Post Verification Redirect!

Change browserid.org urls to persona.org, introduce static.login.persona.org for all static resources.

When a user completes the verification, set their logged in status for the site so a silent assertion can get generated.

* Add countdown until the redirect.

* Highlight transitional code in storage.js
* Clean up input variable names to setReturnTo/getReturnTo
* Fix error message if RP does not specify returnTo
* Add a sample postVerificationReturn.html page to the sample RP
* Remove the automatic setting of returnTo to origin_url in dialog.js
* Instead of returning origin for user.tokenInfo, return returnTo