Merge branch 'master' of https://github.com/bito4ek/jPlainCms