+ [OEM-59] correction to afterDelete method
Merge branch 'master' into hotfix/oem-59
Updated release file
+ [OEM-76] return a generic diabetes term for patients where no type available.
[OE-3847] Fixing the select dropdowns
+ updated RELEASE file
+ bugfix - ensure diabetes type method actually returns a type, use wrapper method to get generic diabetes term
Merge branch 'master' into release/1.5
[OE-3847] Fixing select dropdown fixes and form row margins
Merge branch 'release/1.5' of github.com:openeyes/OpenEyes into release/1.5
Removed behat report file
Removed old TODO file
Removed test and debug code
Merge branch 'release/1.5' into develop