[test merge]
Merge branch 'master' of https://github.com/matthias-wolff/dLabPro.git

Conflicts:
	manual/tutorials/t001.html