small updates
Merge remote-tracking branch 'stather/master'

Conflicts:
	googlemaps/pom.xml