Update
Merge branch 'master' of https://github.com/isflorin/boomin
Merge branch 'master' of https://github.com/isflorin/boomin

Conflicts:
	composer.lock
Update