ocomposer
Merge branch 'master' of github.com:drozdis/widget

Conflicts:
	composer.json