preparing merge with mapsforge-mapview branch