merge
Merge branch 'master' of https://github.com/avionik/AirSwimmer

Conflicts:
	Zeiterfassung/ZeiterfassungAirSwimmer.xls