Merge pull request #86 from alxdarksage/develop

Test of some stuff not well covered by the UI tests, and changes based o...
Merge pull request #87 from alxdarksage/develop

Fixing build with files that seem to have disappeared in git
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Bridge into develop
Medication tracker with tests.
Clean up.