notifica chat su contatti (parziale)
Merge branch 'notifica_messaggio_chat_contatti' of https://github.com/ClockWorkTeam/ClockWork into notifica_messaggio_chat_contatti
notifiche quasi ultimate
finite notifiche chat
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork

Conflicts:
	Codice/client/js/view/ContactView.js
	Codice/client/js/view/ContactsView.js
	Codice/server/sqlite/myTalk.sqlite