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

Conflicts:
	bin/Zappapp.apk
	bin/classes.dex
	bin/dexedLibs/android-support-v4-f80108e484d00cf73fccb7a48343dc5e.jar
	bin/resources.ap_
Sistemato layout_orariClassi