Bug 1049259 - [B2G][Notes] Cannot attach a picture directly from the cam...

...era when creating a new note

Conflicts:
	apps/camera/js/app.js
	apps/camera/js/controllers/camera.js
	apps/camera/test/unit/app_test.js