Aggiunto context menu e sistemate varie cose in giro
Merge commit 'a214fa318a77bc0db2de2fba928a07e3387d30ec'

Conflicts:
	bin/classes.dex
	bin/classes/com/itc/zappapp/Activity_Body/MainDrawerAdapter.class
	bin/classes/com/itc/zappapp/R$id.class
	bin/classes/com/itc/zappapp/R$layout.class
	bin/classes/com/itc/zappapp/R$menu.class
	bin/classes/com/itc/zappapp/R$raw.class
	bin/classes/com/itc/zappapp/R$string.class
	bin/classes/com/itc/zappapp/R$style.class
	bin/classes/com/itc/zappapp/R$xml.class
	bin/classes/com/itc/zappapp/adapter/CircolariAdapter.class
	bin/classes/com/itc/zappapp/adapter/VotiAdapter.class
	bin/classes/com/itc/zappapp/widget/Widget_configuration.class
	bin/classes/com/itc/zappapp/widget/Widget_configuration_small.class
	bin/resources.ap_
	gen/com/itc/zappapp/R.java
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/classes.dex
	bin/classes/com/itc/zappapp/adapter/CircolariAdapter.class
	bin/classes/com/itc/zappapp/adapter/MainDrawerAdapter.class
	bin/classes/com/itc/zappapp/adapter/VotiAdapter.class
	bin/resources.ap_