Cambiata etichetta da antonino
Merge branch 'master' of https://github.com/antoninoxs/QRCodeShop.git

Conflicts:
	ShopApp/src/it/torvergata/mp/MainActivity.java