Bug 966835 - [User story] Add HDR to camera settings

Conflicts:
	apps/camera/js/controllers/camera.js
	apps/camera/js/lib/camera.js