test plouf
notif badge - not tested yet
Merge branch 'notifications' of github.com:matttbe/SIT into notifications
Merge branch 'notifications'
Merge branch 'master' of github.com:matttbe/SIT
clean notif first step
Merge branch 'master' into notifications
new badge email - mise en place
amelioration des notifs, liens vers service et group
fix join group already in group
Merge branch 'master' of github.com:matttbe/SIT
Merge remote-tracking branch 'github/master' into bootstrap_3

Conflicts:
	website/Solidare-IT-g6/features/users/profil.feature