Prova synch cristian

single line commit
Merge branch 'master' of github.com:CristianFMP/MDRepo

Conflicts:
	SmartItineraryWebService/src/md/smartitinerary/rest/model/Itinerary.java