doctar preparation
Merge branch 'stage2' of github.com:HerrMuellerluedenscheid/derec into stage2

Conflicts:
	apps/depth_error.py