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

========

https://hg.mozilla.org/integration/gaia-1_4/rev/a31b6024def6
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #18855 from wilsonpage/999171-v1.4

Bug 999171 - Implement a progress indicator to show progress when the

========

https://hg.mozilla.org/integration/gaia-1_4/rev/bf811e1607dc
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 999171 - Implement a progress indicator to show progress when the viewfinder has not loaded

Conflicts:
	apps/camera/js/app.js
	apps/camera/js/config/config.js
	apps/camera/js/controllers/controls.js
	apps/camera/test/unit/app_test.js
Bumping manifests a=b2g-bump