changes
Merge branch 'master' of https://github.com/anl-tracc/polaris
Changes to conflict resolution to allow splitting of long duration activities
Merge branch 'master' of https://github.com/anl-tracc/polaris
Fixes to demand model build scripts
Merge branch 'master' of https://github.com/anl-tracc/polaris
Merge branch 'master' of https://github.com/anl-tracc/polaris
Addition of synthetic population database.  Correction of database commit logic for network results.