fixed tests
Merge branch 'true_develop' into tanderegg_develop

Conflicts:
	cms/tests/frontend.py