composer update (again)
Merge branch 'master' of github.com:elseym/hkpeter

Conflicts:
	composer.lock
composer update (wtf)