hotfix for a bug found by ratna
Hotfix: Don't exclude sessions with deleted events from available
bugfix (reported by ratna)
[OE-2476] updated sentence
[OE-2478] implemented a php-native LDAP authentication system with a 3-second timeout.  haven't been able to conclusively test this yet.
Merge branch 'release/1.2-moorfields' of github.com:openeyes/OpenEyes into release/1.2-moorfields

Conflicts:
	protected/components/UserIdentity.php
[OE-2440] renamed files
[OE-1876] allow datepickers to default to null
Merge branch 'release/1.2-moorfields' of github.com:openeyes/OpenEyes into release/1.2-moorfields
[OE-2451] added session comments to theatre printout
[OE-2477] added option to not encode the items when calling $site->getLetterArray()
Merge branch 'release/1.2-moorfields' of github.com:openeyes/OpenEyes into release/1.2-moorfields
Merge branch 'release/1.1-moorfields' into release/1.2-moorfields

Conflicts:
	protected/views/letters/admission_letter.php
emergency transport bugfix
Merge branch 'release/1.1-moorfields' into release/1.2-moorfields
Change PDF print method to js embedded in the pdf
Merge branch 'release/1.2-moorfields' into feature/glaucoma
[OE-2451] moved session comments to the header.
Merge branch 'release/1.2-moorfields' of github.com:openeyes/OpenEyes into release/1.2-moorfields
Ensure assetPath is available to ajax views