allow override content-type

server/data_adapter/rest_adapter.js

@@ -126,6 +126,7 @@ RestAdapter.prototype.apiDefaults = function(api, req) {
 
   _.defaults(api, {
     method: 'GET',
+    timeout: 15000, // 15 seconds default
     url: url.format(urlOpts),
     headers: {}
   });

server/router.js

@@ -86,7 +86,11 @@ ServerRouter.prototype.getHandler = function(action, pattern, route) {
 
       res.render(viewPath, viewData, function(err, html) {
         if (err) return next(err);
-        res.type('html');
+
+        if(!res.get('content-type')) {
+            res.type('html');
+        }
+
         res.set(router.getHeadersForRoute(route));
         res.end(html);
       });

shared/fetcher.js

@@ -279,7 +279,20 @@ Fetcher.prototype.hydrate = function(summaries, options, callback) {
       // Also support getting all models for a collection.
       fetcher.collectionStore.get(summary.collection, summary.params, function(collection) {
         if (collection == null) {
-          throw new Error("Collection of type \"" + summary.collection + "\" not found for params: " + JSON.stringify(summary.params));
+          return fetcher.fetch({
+            collection: {
+              collection: summary.collection,
+              params: summary.params
+            }
+          }, null, function(err, res){
+            if (err) {
+              cb(err);
+            } else {
+              results[name] = res.collection;
+              cb(null);
+            }
+          });
+
         }
 
         results[name] = collection;