changes from kim
Merge branch 'master' of https://github.com/cloudspokes/cs-website-cms