modificato cap 7 ST e cap 19 NdP
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork