Conflicts:
	stack/erp5/buildout.cfg
	stack/erp5/instance-erp5-cluster.cfg.in
	stack/erp5/instance-erp5-single.cfg.in
	stack/monitor/buildout.cfg

Conflicts:
	stack/erp5/buildout.cfg
	stack/erp5/instance-zope.cfg.in
	stack/erp5/instance.cfg.in
	stack/monitor/buildout.cfg

also add a temporary patch to respect more tokens in natural language mode.

Move dcron test in dedicated directory/file.
Also move slapos/recipe/test to slapos/test.
Currently : only dcron test.

Conflicts:
	software/slaprunner/schema.json
	software/slaprunner/software.cfg.json

also use the explicit version of nginx-dav-ext-module.
also remove too old nginx-unstable.

stop using quite old setuptools in slapos itself, because many eggs already drop python 2.4/2.5 support.

 Removed local Ploting (use renderjs)
 Remove Password need, use a big hash on the URL Instead
 Fix rsync call to collect the logs.
 Several minor improvements