[OE-2933] fixed cc rendering bug
[OE-2933] html character rendering bugfix
Merge branch 'release/1.2-moorfields' into release/1.3-moorfields
Merge branch 'master' into develop

Conflicts:
	controllers/DefaultController.php