Bug 949941 - [Camera] Replace all memory-backed Blob instances with disk-backed File instances after saving to disk so "pick" activity consumers don't break. r=djf
(cherry picked from commit f23f21bc3837fa0726a97575c3efed33371751fc)

Conflicts:

	apps/camera/js/controllers/camera.js
Remove some CSS warnings on the camera app. r=wilsonpage

Conflicts:

	apps/camera/style/controls.css
	apps/camera/style/settings.css
Bug 981341 - Fix type in camera css. r=daleharvey

Conflicts:

	apps/camera/style/controls.css