Part 4
Merge branch 'master' of github.com:steveYeah/KnpSnappyBundle

Conflicts:
	composer.json