some little change
Merge branch 'master' of github.com:waldo2188/OpenIdConnectRelyingParty

Conflicts:
	app/config/config.yml
	composer.json
	composer.lock
Merge branch 'master' of github.com:waldo2188/OpenIdConnectRelyingParty

Conflicts:
	composer.lock
some change
Merge origin/master

Conflicts:
	composer.lock
remove one duplicated line
remove JSMSecurityBundle