Merge branch 'master' of github.com:calpath/model-objects
Merge branch 'master' of github.com:calpath/model-objects
Merge branch 'dev' of github.com:calpath/model-objects
Naming modstamp to be consitistent. Important in scenario editor and xsd2bb.
Adding controller MO plus other changes.
Updating actuator and adding it to factory.
Merge pull request #120 from javierhe/master

Add method to FDProfile to query FD by offset time
Merge branch 'dev' of github.com:calpath/model-objects into dev
Changes to controller MO - using sensor and actuator set.
Controller MO unit tests
Merge pull request #121 from mnjuhn/dev

Dev
Dynamic Demands objects
Merge branch 'dev' of github.com:calpath/model-objects
Adding link type original to sensor.
Merge pull request #122 from mnjuhn/dev

Adding link type original to sensor.
Merge branch 'dev' of github.com:calpath/model-objects into dev
Testing Serialization sensorset fields
Merge pull request #123 from sean-morris/dev

Unit Test: Serializer for Sensor Set
Merge branch 'dev' of github.com:calpath/model-objects
Cleanup for existing Demand objects