Bug 853420 - Use absolute path for the optimized js file
Merge pull request #8906 from crh0716/853420_v1train

Bug 853420 - Use absolute path for the optimized js file. r=vingtetun, a=tef+
Bug 838011 - Add email address to contacts
Merge pull request #8907 from crh0716/838011_v1train

Bug 838011 - Add email address to contacts. r=asuth, alberto, a=leo+
Merge pull request #8601 from ferjm/bug841521

Bug 841521 - The Trusted UI never opens on first launch (purchase button...(cherry picked from commit 07be1290ffca3c1c6387e19273ec8b05fbce468d)

Conflicts:

	apps/system/js/window_manager.js
Merge pull request #8626 from AntonioMA/url_manifest_fix

Fixed maximum URL length in the browser web activity(cherry picked from commit ddcdcc29156c462d62e4f98e166af5bb28571348)
Merge pull request #8921 from davidflanagan/bug856798

Bug 856798: grant storage permission to mediadb and async storage clients r=fabrice(cherry picked from commit a1c8f555cdab3ed88860b4b0dfbd189f4bb36d20)
Merge pull request #8923 from davidflanagan/bug856798-v1-train

Merge pull request #8921 from davidflanagan/bug856798
Bug 834773 - Support image/* and type arrays in pick activity r=dkuo(cherry picked from commit e64428cae922d32fc043cca390c32473963caec6)
Merge pull request #8926 from davidflanagan/bug834773-v1-train

Bug 834773 - Support image/* and type arrays in pick activity r=dkuo(che...
changed progress height to fit .gif graphic
Fix collisions when several [BB]'s are applied together