upgrade notif
Merge branch 'master' of github.com:matttbe/SIT

Conflicts:
	website/Solidare-IT-g6/app/views/users/_accepted_by.html.erb