Minor changes
Merge branch 'master' of github.com:ClaudioRizzo/WatchDog

Conflicts:
	res/values/strings.xml