Merge remote-tracking branch 'tamlyn/master'

Conflicts:
	composer.lock
	src/AerialShip/SamlSPBundle/Bridge/LogoutReceiveRequest.php
	src/AerialShip/SamlSPBundle/DependencyInjection/Security/Factory/SamlSpFactory.php