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

Conflicts:
	bin/Zappapp.apk
Iniziato widget_orari_classi
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/Zappapp.apk
	bin/classes.dex
	bin/classes/com/itc/zappapp/Activity_Body/Activity_Circolari.class
	bin/classes/com/itc/zappapp/Activity_Body/Activity_Menu.class
	bin/classes/com/itc/zappapp/Activity_Body/Activity_main_drawer.class
	bin/classes/com/itc/zappapp/Activity_Head/Activity_Accedi.class
	bin/classes/com/itc/zappapp/Global.class