EyeLogbook profile setting updates
Merge remote-tracking branch 'origin/andy_dev' into andy_dev

Conflicts:
	protected/views/eyelogbook/_form.php