fixes
local changes
Merge branch 'master' of github.com:compojoom/cmc

Conflicts:
	source/administrator/components/com_cmc/helpers/xmlbuilder.php
	source/administrator/language/en-GB/en-GB.com_cmc.ini