Merge branch 'expeditions_project' into real_time_verification

Conflicts:
	src/examples/expeditions_project/configs/BasicSim.config
	src/examples/expeditions_project/configs/iCreate.config
	src/examples/expeditions_project/original.spec
	src/examples/expeditions_project/two_customer.spec
	src/examples/expeditions_project/two_customer_video.spec