prova
Merge branch 'master' of https://github.com/ClaudioRizzo/WatchDog

Conflicts:
	project.properties