weird commit for projects
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	CrazyMelService/CrazyMelService/bin/CrazyMelService.dll
	CrazyMelService/CrazyMelService/bin/CrazyMelService.pdb
	CrazyMelService/CrazyMelService/obj/Debug/CrazyMelService.dll
	CrazyMelService/CrazyMelService/obj/Debug/CrazyMelService.pdb