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

Conflicts:
	src/it/polimi/dima/watchdog/sms/commands/flags/SMSM3Handler.java