[OE-2716] contacts refactoring
[OE-2716] contacts refactoring now reasonably stable, needs more testing.
[OE-2716] fixed sql query mapping of practice addresses
Merge branch 'release/1.4-moorfields' into feature/contacts

Conflicts:
	controllers/DefaultController.php
	controllers/WaitingListController.php
	views/waitingList/_list.php
typo
[OE-2716] refactoring
[OE-2716] bugfix to waiting list controller
[OE-2716] medical flag no longer exists on the specialty table.
Merge branch 'release/1.4-moorfields' into feature/contacts
Merge branch 'feature/contacts' into release/1.4-moorfields

Conflicts:
	controllers/TheatreDiaryController.php
	controllers/TransportController.php
	controllers/WaitingListController.php