modifica cap 1 e 4 ST
Merge branch 'master' of https://github.com/ClockWorkTeam/ClockWork

Conflicts:
	Documenti/RP/esterni/specifica_tecnica/Capitolo4.lyx