Merge branch 'master' of github.com:cargomedia/CM into issue-1036

Conflicts:
	library/CM/Render.php
	tests/library/CM/Asset/CssTest.php
	tests/library/CM/RenderTest.php
	tests/library/CM/SmartyPlugins/function.usertextTest.php
	tests/library/CM/Usertext/Filter/EmoticonTest.php
fix wrongly merged tests/library/CM/Usertext/Filter/EmoticonTest.php