Fix mapping bug
Fix namespaces
Merge branch 'master' of git://github.com/flame-cms/CMS