[ORB-290] added config param to enable/disable the NHS logo in the yellow patient id box
Merge branch 'release/orbis-r2' of github.com:openeyes/OpenEyes into release/orbis-r2

Conflicts:
	protected/config/core/common.php