DIES IST NICHT AARONS COMMIT :-P
Merge branch 'master' of https://github.com/synoticon/HODOR

Conflicts:
	HODOR/HODOR/Web.config
	HODOR/HODOR/bin/HODOR.dll
	HODOR/HODOR/bin/HODOR.pdb
t