composer.json
Merge branch 'master' of github.com:dobratu/core

Conflicts:
	composer.json