merge admin modules with shop
Merge branch 'master' of github.com:yfix/yf