dfsdf
Merge branch 'master' of https://github.com/avenlia/cms.git

Conflicts:
	cms/test.php
fgh