4 months worth of work
Merge branch 'master' of github.com:mkoryak/lucid-cms