dsfadsfdf
Merge branch 'master' of https://github.com/synoticon/HODOR

Conflicts:
	HODOR/HODOR/Members/Administration/NeuAnlegen.aspx.designer.cs
	HODOR/HODOR/bin/HODOR.dll
	HODOR/HODOR/bin/HODOR.pdb