Merge branch 'hexamac' of github.com:carson/airconvision into hexamac

Conflicts:
	PTAML/src/TargetController.cc
Merge branch 'hexamac' of github.com:carson/airconvision into hexamac

Conflicts:
	PTAML/src/TargetController.cc