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

Conflicts:
	README.md
fix
Update 0.3
Update 0.3
Closes #15
Update 0.3, Closes #19, Closes #3, Closes #24