Cleanup imports
Merge pull request #96 from alxdarksage/develop

Fix TOU lockout; remove need to pass DomainType in API methods
timelines for events and meds
handle null types
Merge pull request #97 from marcel-blonk/BRIDGE-86

timelines for events and meds
Labs for CBCs.
CBC moved to use of labs; also fixes for tests broken by footer checkin.
Removing separate converted columns, moving into lab field.
Remove unused imports
Cleanup imports
Adding events and smiley slider fix
Switching from try/catch to precondition checks.
More inclusive check
More
Fixing NPE for time series in the stub.
Merge pull request #98 from alxdarksage/labwork2

CBCs moved to labs; also fixes for tests broken by footer checkin.
Merge pull request #100 from marcel-blonk/BRIDGE-86

Adding events and smiley slider fix
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Bridge into cleanup
Merge pull request #99 from alxdarksage/cleanup

Cleanup imports
fix test