sistemato diari view e collecion
Merge branch 'master' of github.com:ClockWorkTeam/ClockWork

Conflicts:
	Codice/client/js/collection/ContactsCollection.js
	Codice/client/js/collection/TextMessagesCollection.js