Merge pull request #30 from buggtb/master

Note for Play 2 users with securesocial