Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --cc rest/__init__.py
index 070f07d,58fec2c..5d1f58a
--- 1/rest/__init__.py
--- 2/rest/__init__.py
+++ b/rest/__init__.py
@@@ -81,7 -89,7 +91,7 @@@ def send(request, response, object_prop
              
              response_data['data'].append(d)
           
-         return HttpResponse(json.dumps(response_data), content_type="application/json")
+         return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json")
  
  def error(request, object_name, object_properties):
 -    return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")
 +    return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")