codice
Merge remote-tracking branch 'origin/Teleconferenza'
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork

Conflicts:
	Codice/client/js/communication/NotificationCommunication.js