+ use caching for disorder tree data
Merge branch 'release/1.4' of github.com:openeyes/OpenEyes into release/1.4
Merge branch 'release/1.4' of github.com:openeyes/OpenEyes into release/1.4
[OE-3361] event create failure switching firm fix
+ don't try to create base directory for ProtectedFile if it already exists
Fixed login bug
Merge branch 'release/1.4' into feature/fife

Conflicts:
	protected/components/SiteAndFirmWidget.php