Merge branch 'master' of git://github.com/pegas/SecurityBundle

Conflicts:
	composer.json
Merge branch 'master' of git://github.com/pegas/SecurityBundle