cms edits
Merge branch 'master' of http://github.com/gemy21ce/mek