conflict resolved
fix yaml formatting > indent
Merge branch 'master' of github.com:rapila/cms-base