Fixed validation errors
Various fixes
Various fixes
Merge branch 'master' of https://github.com/rfosterslo/sloco-cms-templates