andato avanti con locale-online
Merge commit 'ee3d3dd7e346bd2d62771ca82eb513508b2836ed'

Conflicts:
	bin/Zappapp.apk
	bin/classes.dex
	bin/resources.ap_