Removed Spring Social as we don't use it
Merge remote-tracking branch 'origin/master'