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

Conflicts:
	apps/test/Test.cpp
	libs/traffic_simulator/Network_Validator_Implementation.h
	libs/traffic_simulator/Network_Validator_Prototype.h
	libs/traffic_simulator/User_Space.h
Merge branch 'master' of https://github.com/anl-tracc/polaris

Conflicts:
	libs/traffic_simulator/Network_Validator_Implementation.h