Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added DemandSetFactory; added modstamp to DemandSet; updated comments
Moving createDemandSet and create DemandProfile to ScenarioFactory
FundamentalDiagram and FundamentalDiagramProfile objects initialized
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:alexeygoder/model-objects
Merge pull request #44 from alexeygoder/master

Added DemandSetFactory
Merge branch 'master' of github.com:calpath/model-objects
PeMSDatum, FundamentalDiagram and FundamentalDiagramProfile
Merge branch 'master' of github.com:gunesder/model-objects
Merge pull request #48 from gunesder/master

FundamentalDiagram & FundamentalDiagramProfile
Merge branch 'master' of github.com:calpath/model-objects
Adding new network schema
Merge pull request #50 from mnjuhn/master

correcting JAXB schema issue for some updates of java and adding locks to network
Merge branch 'master' of github.com:javierhe/model-objects
Merge pull request #49 from javierhe/master

Changes for Node MO and TrafficState XSD(still in progress)
Merge branch 'master' of github.com:calpath/model-objects
FundamentalDiagramProfile
Merge branch 'master' of github.com:gunesder/model-objects