fixed
Merge branch 'master' of https://github.com/aberdnikov/meerkat-core

Conflicts:
	composer.json