no message
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/Zappapp.apk
	bin/resources.ap_
Corretto layout_informazioni
Creato layout_calendario e layout_laboratori