install hwi/oauth-bundle
Merge branch 'master' into prod

Conflicts:
	website/app/AppKernel.php
	website/app/config/routing.yml
	website/app/config/security.yml
install hwi/oauth-bundle
Merge branch 'master' into prod

Conflicts:
	website/src/SWeb/UserBundle/OAuthUserProvider.php
working implementation of OAuth login