user can merge a facebook account on your profile #changelog [Fix #47934307]

To avoid to user to create a new account with your facebook.
Merge branch 'master' of github.com:catarse/catarse
solving conflicts