Updates for new m_prototype
Merge branch 'master' of https://github.com/anl-tracc/polaris

Conflicts:
	libs/core/Forms.h
	libs/traffic_simulator/Advisory_ITS_Implementation.h
	libs/traffic_simulator/Depot_Implementation.h
	libs/traffic_simulator/Network_Event_Implementations.h
	libs/traffic_simulator/Network_Implementation.h
	libs/traffic_simulator/Network_Skimming_Implementation.h
	libs/traffic_simulator/Sensor_Implementation.h
	libs/traffic_simulator/Traffic_Management_Center_Implementation.h
Updates to demand model for v5 spec