automatic update
git
bla
Merge branch 'cristiv3' of https://github.com/codrutas1/Live into cristiv3

Conflicts:
	Automation/Automation.v11.suo
	Automation/MktDef2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Automation/MktDef3/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'cristiv3' of https://github.com/codrutas1/Live into cristiv3

Conflicts:
	Automation/Automation.v11.suo

	Automation/MktDef2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Automation/MktDef3/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache