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...