conflic
.user + .suo conflic
Merge branch 'dev' of https://github.com/Ucantseeme/eCCore into dev

Conflicts:
	Source/NoodleSites/NoodleSites.v12.suo
	Source/NoodleSites/Presentation Layer/Noodles.Frontend/Noodles.Frontend.csproj.user