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

Conflicts:
	bin/resources.ap_
	bin/zappapp.apk
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/resources.ap_
	bin/zappapp.apk
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/resources.ap_
	bin/zappapp.apk
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/zappapp.apk
- Modifiche varie al database
- Correzione lista prof doppia