changes
local commit
Merge branch 'master' of https://github.com/anl-tracc/polaris

Conflicts:
	libs/core/Container_Forms.h
	libs/core/Forms.h
	libs/traffic_simulator/Routing_Prototype.h
Merge branch 'master' of https://github.com/anl-tracc/polaris