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

Conflicts:
	bin/resources.ap_
	bin/zappapp.apk
	res/layout-large/layout_informazioni.xml
	res/layout/layout_informazioni.xml
Centrate textView layout_informazioni