Merge branch 'master' of github.com:nedforce/devcms-core