MEMSAP Beta changes
Merge branch 'MEMSAP' of github.com:FAIMS/DeluxeExcavationSample into MEMSAP

Conflicts:
	ui_schema.xml