ShoppingFragment Funzionante
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	gen/com/aidilab/airbus/R.java