fix catalog and i18n issues
Merge branch 'master' of git://github.com/keltanas/SiteForeverCMS