#4137 general architecture tidy
#4137 general architecture tidy
Merge remote-tracking branch 'origin/master'

Conflicts:
	Core/NakedObjects.Architecture/Component/INakedObjectReflector.cs
	Core/NakedObjects.Architecture/Configuration/ServiceType.cs
	Core/NakedObjects.Architecture/NakedObjects.Architecture.csproj