horse merged to master with shop module
CMS correct DB data scheme
CMS correct DB data scheme