Merge branch 'oauth2provider' of github.com:coolaj86/angular-project-template into oauth2provider
Merge branch 'oauth2provider' of github.com:coolaj86/angular-project-template into oauth2provider