document changes in train-2013.06.19
bump version in dev after branching train-2013.06.19
Do not generate a silent assertion for an address in a transition state. Update backend to correctly mark addresses as "secondary" upon verification.

* When calling /wsapi/complete_reset.js or /wsapi/complete_transition.js, immediately flip the type of the email address to "secondary"
* Add explanation of silent assertions.

fixes #3515
Add Selenium tests to check for transition states.
Add backend tests for transition_no_password and transition_to_secondary cases to ensure email type is set to secondary and state changed to known.
Add a transition-to-secondary-forgot-password Selenium test.

This is for a user who has to transition to a secondary but forgot their password.
When the user cancels from the "primary_offline" state, reset the caches so the user can try the address again.

Fixes #3155
Merge pull request #3565 from mozilla/issue_3155-address-lookup-fail

When the user cancels from the "primary_offline" state, reset the caches so the user can try the address again.
Merge pull request #3545 from mozilla/issue_3515-silent-assertions

Do not generate a silent assertion for an address in a transition state.
Update favicon
Initial commit for supporting partial localization of TOS and PP

Conflicts:

	lib/static/views.js
	resources/static/dialog/views/required_email.ejs
	resources/static/dialog/views/set_password.ejs
	resources/static/dialog/views/verify_primary_user.ejs
	resources/views/dialog.ejs
	resources/views/layout.ejs
	resources/views/signin.ejs
Adding path to log message per jedp
Merge pull request #3581 from mozilla/update-favicon

Update favicon

r+
Merge pull request #3580 from mozilla/issue-3375-localize-tospp-merge-dev

Support localization of TOS and PP