use application/json

oxdata/oxdjango/shortcuts.py

@@ -25,7 +25,7 @@ def _to_json(python_object):
         return python_object.strftime('%Y-%m-%dT%H:%M:%SZ')
     raise TypeError('%s %s is not JSON serializable' % (repr(python_object), type(python_object)))
 
-def render_to_json_response(dictionary, content_type="text/json", status=200):
+def render_to_json_response(dictionary, content_type="application/json", status=200):
     indent = None
     if settings.DEBUG:
         content_type = "text/javascript"

oxdata/urls.py

@@ -48,7 +48,8 @@ if settings.DEBUG:
 
 #load local urls if present
 try:
-    from local_urls import urlpatterns
+    from local_urls import urlpatterns as local_patterns
+    urlpatterns += local_patterns
 except ImportError:
     pass