upd
Merge branch 'master' of github.com:Smart-Core/CMF-Sandbox

Conflicts:
	composer.lock