[OE-2933] show site name with addresses where the institution is not moorfields.
[OE-2933] don't display both the site and the institution name if they're identical.
bugfix
bugfix: operations may need to be cancelled where there is no episode (housekeeping / legacy letters)
Merge branch 'release/1.2-moorfields' of github.com:openeyes/OpenEyes into release/1.2-moorfields
[OE-2259] Missing service name in contact string
[OE-2760] Fix admission contact string and logic (External)
Some drug columns should be nullable
Merge branch 'release/1.2-moorfields' into release/1.3-moorfields

Conflicts:
	protected/models/elements/ElementOperation.php
[OE-3013] added access level field to the adduser form.
[OE-3013] fixed deletion possible when user has read only access.
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OpenEyes into release/1.3-moorfields
[OE-3011] Fragment renderDefaultElements to allow element option setting to be overridden cleanly
Merge branch 'release/1.3-moorfields' of ssh://github.com/openeyes/OpenEyes into release/1.3-moorfields
Merge branch 'release/1.3-moorfields' into release/1.4-moorfields