[OE-2716] contacts refactoring
Merge branch 'release/1.4-moorfields' into feature/contacts
[OE-260] Site_id moved from cookie to session
Merge branch 'release/1.3-moorfields' into release/1.4-moorfields
Merge branch 'release/1.3-moorfields' into release/1.4-moorfields
Merge branch 'feature/contacts' into release/1.4-moorfields
[OE-3017] fixed ordering of drug types.
Merge branch 'release/1.4-moorfields' into develop
Merge branch 'master' into develop
[OE-2648] refactored correspondence shortcode system
Merge branch 'develop' of github.com:openeyes/OphDrPrescription into develop
Merge branch 'master' into develop
PSR2 compliance changes
PSR2 compliance changes
OE-3193 - New alert dialogs
Merge branch 'master' into release/1.4
+ release documentation
+ release correction
+ [OE-3399] fix for address in prescription print