Merge origin/master into Martin

Conflicts:
	Studienprojekt2/src/studienprojekt/Main.java
	Studienprojekt2/src/studienprojekt/Mapper.java
Merge origin/Martin into Martin

Conflicts:
	Studienprojekt2/src/studienprojekt/osm/OSMWay.java
Merge pull request #5 from Kryolith/Martin

Martin