Refactored for ABM-253 and finished.
Refactored and tested ABM-254
Merge branch 'develop' of https://github.com/SANDAG/ABM into develop

Conflicts:
	src/main/java/org/sandag/abm/ctramp/TourModeChoiceDMU.java
	src/test/java/org/sandag/abm/application/SandagTripModeChoiceDMUTest.java