issue #8
issue #9
Merge branch 'master' of a73435.berlin.ptb.de:thomas.bock/yamp
Merge branch 'master' of a73435.berlin.ptb.de:thomas.bock/yamp
+ T-kalib. doc

	modified:   .ericaignore
	modified:   _attachments/vaclab/yamp.worker.js
	new file:   docs/fm3-ce3-t-sensor_calibration/_id.str.txt
	new file:   docs/fm3-ce3-t-sensor_calibration/_rev.str.txt
	new file:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Date.arr.js
	new file:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/InfoHeading.str.txt
	new file:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/InfoPages.arr.js
	new file:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Standard.str.txt
	new file:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Tasks.arr.js
	new file:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Title.str.txt
	modified:   lib/vaclab/templates.js
async rscript, css
Merge branch 'master' of a73435.berlin.ptb.de:thomas.bock/yamp

Conflicts:
	_attachments/vaclab/yamp.worker.js

	geändert:   .ericaignore
	geändert:   _attachments/vaclab/yamp.worker.js
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/_id.str.txt
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/_rev.str.txt
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Date.arr.js
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/InfoHeading.str.txt
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/InfoPages.arr.js
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Standard.str.txt
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Tasks.arr.js
	neue Datei:   docs/fm3-ce3-t-sensor_calibration/yamp.Obj/Title.str.txt
	geändert:   lib/vaclab/templates.js