test
Merge branch 'master' of https://github.com/SebastianKaminski/cms

Conflicts:
	workspace/utilities/master.xsl