Update dependencies
Merge branch 'shop' of github.com:osen-web-development/cmf into shop