updates to code
Merge branch 'master' of https://github.com/earthlinkdesign/cdkstone

Conflicts:
	administrator/components/com_akeeba/backup/akeeba.backend.log