Bug 823025 - Call Log: Returning from contact details should go back to call log, not contact list.

When user click back button in contact details page in iframe, the iframe will post message to Dialer app. After receive back message, Dialer app will show Call log page.
Bug 810311 - [SMS] Text is too small in input fields (8pt) + speech bubbles (9pt) r=rnowm
bug-821623 [General][Building Blocks] Disabled Button States are incorrect
BUG 796798 - [settings] colorized bar chart missing from media storage settings
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into bug796798

Conflicts:
	apps/settings/js/utils.js
Bug 833232 - Use dialEmergency when the sim card is locked
Merge pull request #7934 from crh0716/833232

Bug 833232 - Use dialEmergency when the sim card is locked r=etienne
Merge pull request #7743 from majewan/bug796798

BUG 796798 - [settings] colorized bar chart missing from media storage s...
bug 824599 - handle connect request from a device just unpaired
this may cause JavaScript error because can't find the device
on the list. we also prevent to connect it again once they paired,
because the connection has been setup automatically.
bug 818829 - Hide password fields when the security level is open.
Merge pull request #6873 from crh0716/818829

Bug 818829 - [Settings] The password field shoud be grayed-out/hidden is WiFi is shared with level security open r=evelynhung
Bug 818423 - [Email] Apply correct hit state to tool bars
Merge pull request #7897 from steveck-chung/email-toolbar

Bug 818423 - [Email] Apply correct hit state to tool bars. r=asuth
Bug 798258 - [Email] [VD] Search field is wrong
Merge pull request #7895 from steveck-chung/email-searchbar

Bug 798258 - [Email] [VD] Search field is wrong. r=asuth.
Merge pull request #7920 from evelynhung/issue-824599

bug 824599 - handle connect request from a device just unpaired
Bug 820317 - [Email] Confirmation overlay didn't sync with building-block
Merge pull request #7883 from steveck-chung/email-confirm-dialog

Bug 820317 - [Email] Confirmation overlay didn't sync with building-block. r=asuth.
Merge pull request #7836 from evanxd/bug-823025-5

Bug 823025 - Call Log: Returning from contact details should go back to call log, not contact list, r=etiennesegonzac, a=approval-gaia-v1.
Bug 836135. Avoid PLAYTONE response when dialog is showed