Merge branch 'master' of github.com:cargomedia/cm into issue-475

Conflicts:
	tests/helpers/CMTest/library/CMTest/TestCase.php
Update decode/encode tests of ParamsTest.