Merge remote-tracking branch 'origin/master'

Conflicts:
	mobow/include/googlemaps.js