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

========

https://hg.mozilla.org/integration/gaia-2_1/rev/04fbd2284f00
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1095714 - [SearchWindow] Remove SettingsListener on destroy r=alive

========

https://hg.mozilla.org/integration/gaia-2_1/rev/b3f0816e34dd
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1029763 - The contact thumbnail scaling is terrible, all jagged

Conflicts:
	apps/sharedtest/test/unit/image_utils_test.js
Bumping manifests a=b2g-bump