modifica cap2 e diario
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork