Fixed merge conflicts
Fixed merge conflicts

cpitman/spring-social-auth0,cpitman/spring-social-auth0,spring-projects/spring-social-github,spring-projects/spring-social-github,pkdevbox/spring-social-github,pkdevbox/spring-social-github