fix bugs for cms multi languages
after merging with i18n
Merge branch 'master' of http://github.com/gemy21ce/mek