Bug 841521 - The Trusted UI never opens on first launch (purchase button does nothing). r=alive, albertopq
Bug 838040 - [Browser][User Story] Removing bookmarks from Bookmarks tab
Bug 848226 - [Settings] Remove useless code
Bug 820268 - Add PIN keyboard to input digits only. r=rudyl
Bug 849751 - Add cck/spck support to FTU and the system app.
Bug 852075 - Reliable home button in inline activities
Bug 829078 - [email] adjust and remove some styles in *.css of email

Conflicts:
	apps/email/style/compose-cards.css
	apps/email/style/custom_dialog.css
Bug 844995 - Setting up new email account screen updates
Bug 844973 - New Account Screen - Layout and Type updates
Bug 845048 - Email screen type and layout updates

Conflicts:
	apps/email/style/message-cards.css
Bug 845042 - Load more messages layout and type update
Bug 844978 - Email Manual Setup Layout and Type updates
bug 851278 followup - remove obsolete dir from external apps dirs
Merge branch 'master' into bug-851278
Merge pull request #8707 from mykmelez/bug-851278

bug 851278 followup - remove obsolete dir from external apps dirs
Merge pull request #8691 from masap/20130317_1

Bug 848226 - [Settings] Remove useless code r=djf
no bug, whitespace linting fix r=irc-fabrice
Merge pull request #8641 from gasolin/issue-838040

Bug 838040 - allow access of bookmark menu from the bookmark tab, r=bfrancis
Merge pull request #8698 from crh0716/849751

Bug 849751 - Add cck/spck support to FTU and the system app. r=timdream, fcampo
Merge pull request #8687 from yxl/bug-820268-digits-keyboard

Bug 820268 - Add PIN keyboard to input digits only. r=rudyl