(*) CTL-155 Replace usages of IServiceLocator by IDependencyResolver
Merge branch 'develop' of https://github.com/Catel/Catel into develop

Conflicts:
	src/Catel.Extensions.Prism/Catel.Extensions.Prism.NET40/Catel.Extensions.Prism.NET40.csproj
	src/Catel.Extensions.Prism/Catel.Extensions.Prism.NET45/Catel.Extensions.Prism.NET45.csproj