Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge latest upstream mozilla
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Bug 808618. Pick Contact Activity cross icon in header
Bug 824625 - Make "Sample Format" label localizable
Bug 820145 - Update icons

Changes the edit icon into a edit mode type of icon.
Adds a compose icon as the old edit icon.
Adds an edit contact icon.
Bug 826872 - Incrementally Parse XML/ICAL fix mem-leak in icalComponents
Bug 827137 - Cost control running with foreground priority when not visible (again)