Merge branch 'master' of git://github.com/vysinsky/sandbox

Conflicts:
	composer.json
Merge branch 'master' of git://github.com/vysinsky/sandbox