Merge branch 'release/1.4.6' into develop
update version to 1.5.0-SNAPSHOT
Merge branch 'master' into develop
undo unintended change of gatling version
add code conventions template
properly set the resource IDs on the authorization request
protect the /approvals endpoint from client access unless the oauth.approvals scope has been set.
Revert "update version to 1.5.0-SNAPSHOT"

This reverts commit 91f1f86cdb73764763c38c26bfe35709ed9a5ecb.
Merge pull request #67 from fhanik/rel1.4.6-amendment

Rel 1.4.6 amendment
Merge branch 'release/1.4.6'
Auto-merge remote-tracking branch 'upstream/master'