Working on schedules
Updating to upstream develop; resolve conflict
Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into schedules
Work in progress on schedule plans
Intermediate checkin
Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into schedules
Further fixes
Further changes
Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into schedules
These will be overwritten
A vastly better way to store strategy object that generates better JSON
Fixing deserialization of new JSON format
Stubbing out assignment of a new user to an existing schedule plan
Adding assignment of new users to the strategies
Will need the plan guid when schedules are cloned and saved for users
Merge pull request #212 from alxdarksage/schedules

Schedules
Resolve merge conflict.