zwischenspeicher
Merge remote-tracking branch 'origin/master'

Conflicts:
	FlightSegment/Buffer.h