Preparazione
Merge branch 'master' of ssh://github.com/CristianFMP/MDRepo

Conflicts:
	SmartItineraryClient/bin/SmartItineraryClient.apk
	SmartItineraryClient/bin/classes.dex
	SmartItineraryClient/bin/resources.ap_
	SmartItineraryClient/src/md/smartitineraryclient/ResultActivity.java