#
Merge branch 'master' of https://github.com/mihaistoie/sikia

Conflicts:
	src/Sikia.Core/Execution/Container.cs
	src/Sikia.Core/Sikia.Core.csproj
	src/Sikia.Model/Types/IObjectLifetime.cs