prova 5
Merge branch 'master' of https://github.com/dvdciri/zappapp

Conflicts:
	bin/classes/com/itc/zappapp/MainActivity.class
	src/com/itc/zappapp/MainActivity.java