Thomas Lechauve work on simple HTML5 "Application Server" deployment.

Conflicts:
	CHANGES.txt
	component/tar/buildout.cfg
	setup.py
	slapos/recipe/downloader.py
	slapos/recipe/gitinit.py
	slapos/recipe/librecipe/execute.py
	software/gitrepo/git-http-backend.cgi.in
	software/gitrepo/gitweb.cgi.in
	software/gitrepo/gitweb.conf.in
	software/gitrepo/httpd.conf.in
	software/gitrepo/instance-gitrepo.cfg
	software/gitrepo/software.cfg
	software/lxc/instance-lxc.cfg
	software/lxc/lxc.conf.in
	software/lxc/software.cfg

os.rename failed when it move the file across devices/mount-points.
shutil.move allow to rename/move a file from one physical device to
another.

os.rename failed when it move the file across devices/mount-points.
shutil.move allow to rename/move a file from one physical device to
another.