addedd doctrine :D
Merge branch 'master' of github.com:simgroep/oauth1-service
resolved conflicts
Merge branch 'master' of github.com:simgroep/oauth1-service

Conflicts:
	composer.json