refactors the spring-social config (still not fully functional, but we're getting there !)
Merge remote-tracking branch 'origin/master'