Some small changes regarding target API
Merge branch 'itinerary' into Geocode

Conflicts:
	project.properties