fixed a bug reported by Ed Murphy, an old call to fetchPASReferral() was in the BaseEventTypeController.
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development

Conflicts:
	protected/controllers/BaseEventTypeController.php
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1-moorfields' into development
Merge branch 'release/1.1-moorfields' into development

Conflicts:
	.gitignore
Merge branch 'release/1.2-moorfields' into development

Conflicts:
	.gitignore
[OE-3037] ensure delete button isn't shown for an event if your subspecialty doesn't match the episode subspecialty.
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OpenEyes into release/1.3-moorfields
Merge branch 'development'
Bring development up to date
fixed default scope
[OE-3044]

HTML encoding issue, the params of search were passed to the db html encoded including apostrophe thus couldnt be found.
fix : decode the html before passing it to the query