je retablis le boulot de benjamin qui etait parti avec le merge
notifications methods goes in application controller
/
le type est maintenant dynamique
Merge remote-tracking branch 'origin/master' into notifications
notify if follow/unfollow
++
clean the code
Merge remote-tracking branch 'origin/master' into notifications
Merge remote-tracking branch 'origin/master' into notifications
two notifications if two type different
notification we like you
Merge remote-tracking branch 'origin/master' into notifications
No more bug while destroying a service
Merge branch 'master' of github.com:matttbe/SIT

Conflicts:
	website/Solidare-IT-g6/db/schema.rb
Merge branch 'master' of github.com:matttbe/SIT