commit 1
Merge branch 'master' of https://github.com/m7x/cms-test.git into test

Conflicts:
	test.py