Merge lp:~bfiller/camera-app/content-hub-fixes into lp:~fboucault/camera-app/ui_rewrite

[Bill Filler]

fix content-hub integration

=== added file 'click/camera-content.json'
--- click/camera-content.json	1970-01-01 00:00:00 +0000
+++ click/camera-content.json	2014-07-02 20:57:00 +0000
@@ -0,0 +1,6 @@
+{
+    "source": [
+        "pictures",
+        "videos"
+    ]
+}
 \ No newline at end of file
 
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-06-30 08:17:29 +0000
+++ click/manifest.json.in	2014-07-02 20:57:00 +0000
@@ -6,6 +6,7 @@
     "hooks": {
         "camera": {
             "apparmor": "camera-apparmor.json", 
+            "content-hub": "camera-content.json",
             "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
         }
     },