[OE-3987] hide deleted sites
[OE-3987] added param to get the site list including deleted items (for forms)
[OE-3987] fixed model not inheriting from the correct base model
[OE-3987] hide deleted items from getList()
+ fix ContactTest by ensuring person fixture loaded
+ reformatting of ContactTest code for psr3
Merge branch 'release/1.6' of github.com:openeyes/OpenEyes into release/1.6
[OEM-141] Script to clean up orphaned addresses.
[OEM-141] Replace parent_id/class on address with contact_id and add foreign key.
[OEM-141] Update code for modified address schema.
Merge branch 'hotfix/oem-141' into release/1.6
Finally fixed #date-picker issue that would occasionally cause @diagnosis regresssion tests to fail
Update in prep.sh to include yiic cleanupaddress before Migrating
 Removed #tofix after re-testing big fixes
[OE-3987] handled condition where ids passed to notDeletedOrPk are null
+ [OE-4040] fix for cancel buttons on core admin forms.
Try to fix JQuery absence error on behat Homepage search submit
Try to fix JQuery absence error on behat checks throughout the project
+ [OE-3815] layout tweaks for previous element display
[OE-4041] Added missing print CSS
Fixed conflicts
Removed merge conflict file
Added: OperationBooking - Choose Ward & RTT Comments tests