added missing spring security oauth configuration and adjusted missing injections
Merge remote-tracking branch 'origin/develop' into develop