fix
Merge branch 'master' of https://github.com/Hammster/ClockworkCMS

Conflicts:
	README.md