Bug 965016 - about:accounts should always say "Firefox Accounts", not "Nightly Accounts". r=ttaubert

--HG--
extra : rebase_source : eebff0b5ba1b783fea1bb70fa0b848ac1c7e85e7
Bug 958927 - XUL dialogs for sync unlink and relink confirmation dialogs. r=gavin

Conflicts:
	browser/base/content/aboutaccounts/aboutaccounts.js

--HG--
extra : rebase_source : 2c81fe29d3b85eb8174b988cbaff516e71c39358