Put back ERP5 and slapos.cookbook in development mode

stack/erp5/buildout.cfg

@@ -58,6 +58,7 @@ extends =
 
 parts =
   erp5-util-develop
+  slapos-cookbook-develop
   slapos-cookbook
   rdiff-backup
   aspell
@@ -316,8 +317,7 @@ repository_id_list = erp5
 [erp5]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
-branch =
-revision = 08d22b65daad02460c0834e395223935a0ec161f
+branch = master
 git-executable = ${git:location}/bin/git
 
 [testrunner]
@@ -559,8 +559,8 @@ pysvn = 1.7.4nxd006
 # we are still using this old stable version.
 rdiff-backup = 1.0.5
 
-# use newest version of slapos.cookbook at time of release
-slapos.cookbook = 0.89
+# use newest version of slapos.cookbook
+slapos.cookbook =
 
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001