Merge branch 'develop' into feature/ra

Conflicts:
	src/Surfnet/StepupMiddleware/ApiBundle/Controller/IdentityController.php
	src/Surfnet/StepupMiddleware/ApiBundle/Identity/Command/SearchVerifiedSecondFactorCommand.php
	src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/SecondFactorService.php
	src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml