Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
Bug 975535 - E.me followups [r=ranbena]
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