fix everything, build ok, hell yeah
?

Merge branch 'master' of https://github.com/dni/publish-cms