composer.json
Merge branch 'master' of https://github.com/drozdis/PhpWidget

Conflicts:
	composer.json