Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
Bug 975535 - E.me followups [r=ranbena]
Merge pull request #18379 from justindarc/bug996513

Bug 996513 - [Flame][Camera] front camera can not work in master branch
Merge pull request #17956 from DouglasSherk/965854-voicemail-sim-indicator

Bug 965854 - [DSDS][System] Display SIM indication in voicemail notification. r=etienne
Conflicts:
	apps/system/index.html
Merge pull request #18462 from justindarc/bug993686

Bug 993686 - [B2G][Camera] - Tapping repeatedly on capture button while ...
Merge branch 'v1.4-bug-975535-homescreen' of github.com:samjoch/gaia into samjoch-v1.4-bug-975535-homescreen

Conflicts:
	external-apps/marketplace.firefox.com/application.zip
Merge pull request #17762 from gabrielesvelto/bug-989357-recompress-application-icons

Bug 989357 - Recompressed the new application icons r=crdlc,ran
Merge pull request #18075 from lissyx/bug989876

Bug 989876 - Setting installTime and updateTime fields r=yurenju