no message
Merge commit 'fbfede7379fb2de332838be3f65a50ee7c762b19'

# By dvdciri
# Via dvdciri
* commit 'fbfede7379fb2de332838be3f65a50ee7c762b19':
  Modificato l'allarme per le 12 (prova)

Conflicts:
	src/com/itc/zappapp/Global.java