Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a60bda558e67
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16038 from KevinGrandon/bug_967994_hybridbar

Bug 967994 - Implement various levels of rocketness

========

https://hg.mozilla.org/integration/gaia-central/rev/8a91697ebb8e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 967994 - Implement various levels of rocketness r=yurenju
Bumping manifests a=b2g-bump
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/41dc23f8d57e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #16041 from kumarrishav/issue-933365

Bug 933365 - [Messages] Consider adding the "resend" option in the message context menu for errored message
r=rwaldron

========

https://hg.mozilla.org/integration/gaia-central/rev/ad478ca93672
Author: kumarrishav <reactiverishav007@gmail.com>
Desc: Bug 933365 - [Messages] Consider adding the resend option in the message context menu for errored message

========

https://hg.mozilla.org/integration/gaia-central/rev/547d7b6406c0
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #16065 from yurenju/calendar-makefile

Bug 968669 - Migrate code snippet for calendar customization from applications-data.js to apps/calendar/build/build.js, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/5cbc31915c1e
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 968669 - Migrate code snippet for calendar customization from applications-data.js to apps/calendar/build/build.js

========

https://hg.mozilla.org/integration/gaia-central/rev/e35578d856f5
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #15757 from gasolin/issue-964188

Bug 964188 - [Settings] fix main integration jshint, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/7acffdfc32d6
Author: gasolin <gasolin@gmail.com>
Desc: Bug 964188 - [Settings] fix main integration jshint
Bumping manifests a=b2g-bump