Aggiunta icona impostazioni alla prima voce del navigationDrawer
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/classes.dex
	bin/classes/com/itc/zappapp/Activity_Body/Activity_RiepilogoDati.class
	bin/classes/com/itc/zappapp/Activity_Body/Activity_Voti.class
	bin/classes/com/itc/zappapp/Activity_Head/Activity_Accedi.class
	bin/classes/com/itc/zappapp/widget/Widget_configuration.class
	bin/resources.ap_
	bin/zappapp.apk