[SUP-52] Fixed layout paths in error templates
Merge branch 'master' of github.com:openeyes/OpenEyes
OE-3518 - disabled CSRF token check in login form to avoid intermittant CSRF errors when multiple clients are opened simultaneously thus making cookies inconsistent
Merge branch 'master' into demo/orbis

Conflicts:
	protected/config/core/common.php