[OE-1863] changes to make prescription run in a subdirectory.
[OE-1936] updated prescription to use the new datatype element div properties from examination.
corrected typo
Merge branch 'feature/run_in_a_subdirectory' into release/1.1-moorfields

Conflicts:
	controllers/DefaultController.php
Fix frequency string for taper printing
Merge branch 'release/1-moorfields' into release/1.1-moorfields
[OE-2089] added missing button names.
Merge branch 'release/1-moorfields' of github.com:openeyes/OphDrPrescription into release/1-moorfields
Merge branch 'release/1-moorfields' into release/1.1-moorfields

Conflicts:
	views/default/delete.php
bugfix for event deletion bug.
bugfix for event deletion issue.
[OE-2059] made drugs show on new lines rather than being all comma-separated.
[OE-2058] indent tapering on prescription letter format.
Merge branch 'release/1-moorfields' into release/1.1-moorfields
[OE-2059] new drugs after previous drug/tapers weren't shown on a new line.
Merge branch 'release/1-moorfields' into release/1.1-moorfields
[OE-2137] moved "Continued by GP" checkbox outside of the Pharmacy Use Only section.
[OE-2047] ordered durations by new display_order column.
[OE-2156] disable the default scope on the Drug model when viewing prescription items.
[OE-2156] updated to use new discontinued model method.