FIX: conflict in settings.py

diff --cc myslice/config.py
index 6ef5061,4edd388..f6285b2
--- 1/myslice/config.py
--- 2/myslice/config.py
+++ b/myslice/config.py
@@@ -1,16 -1,17 +1,17 @@@
  class Config:
  
-     # production should use https of course
+ # this version of unfold expects a backend that runs a new API
  
- # an old-fashioned API - that's what is currently only supported   
-     #manifold_url = "http://manifold.pl.sophia.inria.fr:7080/"
-     manifold_url = "http://localhost:7080/"
- # this one runs a new API, but currently (april 2013) there are missing
- # features; GetSession and GetPersons are still there (they should go away) and 
- # the code for retrieving metadata does not work as-is, and I have no clue 
- # what it should become anyways, so...
- #    manifold_url = "http://dev.myslice.info:7080/"
+ # production should probably use https of course
  
 -    manifold_url = "http://dev.myslice.info:7080/"
 -
+ 
+ # if you use a development backend running on this box
+ #    manifold_url = "http://localhost:7080/"
+ # the INRIA setup
+ #    manifold_url = "http://manifold.pl.sophia.inria.fr:7080/"
+ # the OpenLab-wide backend as managed by UPMC
++#    manifold_url = "http://dev.myslice.info:7080/" # development version
++     manifold_url = "http://test.myslice.info:7080/" #stable manifol
      # exporting these details to js
      @staticmethod
      def manifold_js_export ():