cambiamenti al layout + cancellazione drawable inutili
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties