merge
Merge branch 'dev' of https://github.com/markusmo/SportsClubManager into dev

Conflicts:
	Presentation/Presentation.pptx