Fixed conflict
Merge branch 'dev' of https://github.com/Ucantseeme/eCCore into dev

Conflicts:
	Source/NoodleSites/Business Layer/Noodles.BL/Noodles.BL.csproj