[OE-2554] bugfix
[OE-2554] bugfix
bugfix
fixed typo
Merge branch 'release/1.1-moorfields' into release/1.2-moorfields

Conflicts:
	protected/models/elements/ElementOperation.php