Mike's updates.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CUAS Workload Measurement/document.pdf
	CUAS Workload Measurement/framework.tex
	CUAS Workload Measurement/metric_classes.tex