sistemato problema view zombie
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork

Conflicts:
	Codice/client/js/view/ContactView.js