Merge pull request #6 from ngodfraind/set-registration-mail-content

Set registration mail content
Merge remote-tracking branch 'upstream/master'
Moving badges migrations up
Removing useless migrations
Merge pull request #320 from ngodfraind/fixing-migrations

Fixing migrations
Update badge logo field on edit page + minor update for lists
Badge updater.
Merge pull request #321 from ngodfraind/fixing-migrations

Badge updater.
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content
Correct edit page with new design update
Authentication Listener update
Merge https://github.com/solispauwels/CoreBundle into set-registration-mail-content
Merge pull request #322 from maxailloud/badge_interface

Badge interface
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content