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

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

Conflicts:
	composer.lock
	composer.phar