Update composer
Merge branch 'master' of git://github.com/neolao/php

Conflicts:
	composer.json