ASD
Merge branch 'master' of https://github.com/gch-joa/gch_hack_hf

Conflicts:
	project/hackathon/Views/AbstimmungsStatsView.xaml
adsf