Merge branch 'dev' of github.com:calpath/model-objects into dev
Add RouteSet methods to Scenario object
Merge branch 'dev' of github.com:calpath/model-objects into dev
Try to get better performance with large networks using maps for links and nodes
Changes to support new definitions of Signal Plans, Schedules, Phases, Movements, and Timings
Updates to bring new signal table specs in line with DB and other model objects
Merge branch 'dev' of github.com:tmkpath/model-objects into dev
Fix use of hashmaps when loading from XML
Revert "Try to get better performance with large networks using maps for links and nodes"

This reverts commit db9a8c9b2ebbba48b10ae0f34c71b63c17d6e7b0.

Conflicts:
	src/main/java/edu/berkeley/path/model_objects/network/Network.java
Better error messages
Merge pull request #155 from javierhe/dev

Add RouteSet methods to Scenario object