Merge origin/Martin into Martin

Conflicts:
	Studienprojekt2/src/studienprojekt/osm/OSMWay.java