25.10.2013
tjp
fehler commit
Merge branch 'master' of https://github.com/synoticon/HODOR

Conflicts:
	HODOR/HODOR/Members/Administration/Verwaltung.aspx
	HODOR/HODOR/Web.config
Merge branch 'master' of https://github.com/synoticon/HODOR

Conflicts:
	HODOR/HODOR/Web.config