Updated composer dependencies.
Merge branch 'master' of github.com:frodosghost/PublicBundle

Conflicts:
	composer.json