Merge branch 'develop' of github.com:arkors/oauth into develop
Rename controller to handler