Composer
Merge branch 'master' of https://github.com/LavaLite/Image

Conflicts:
	composer.json