Modified Site class, modified Def2, added Def3, Def4, TCR
added BaseDef class and make it parent for Defs
Delete file1.txt
modified MktDef2 test
Merge branch 'stage' of https://github.com/codrutas1/Live into stage
mkt-def2 test cases
Merge pull request #2 from codrutas1/Andreea

mkt-def2 test cases
zzz
zxc
zxzcxz
zzzz
add manageAlert function in Utils and TCR project
Merge pull request #4 from codrutas1/codruta

add manageAlert function in Utils and TCR project
mktdef2 tests
Merge pull request #5 from codrutas1/Andreea

mktdef2 tests
automatic update
Merge branch 'stage' of https://github.com/codrutas1/Live into stage

Conflicts:
	Automation/Automation.Base/Def2.cs
	Automation/Automation.Base/Def3.cs
	Automation/Automation.Base/bin/Debug/WebDriver.dll
	Automation/Automation.Base/bin/Release/PinInfoSys.AutomatedTestting.Base.pdb
	Automation/Automation.Base/bin/Release/WebDriver.Support.dll
	Automation/Automation.Base/bin/Release/WebDriver.dll
	Automation/Automation.Base/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Automation/Automation.Base/obj/Release/PinInfoSys.AutomatedTestting.Base.pdb
	Automation/Automation.v11.suo
	Automation/MktDef2/MktDef2Lp1Tests.cs
	Automation/MktDef2/bin/Debug/TestResult.xml
	Automation/MktDef2/bin/Debug/nunit.framework.dll
	Automation/MktDef2/bin/Debug/nunit.framework.xml
	Automation/MktDef2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Automation/MktDef3/bin/Release/MktDef3.pdb
	Automation/MktDef3/bin/Release/PinInfoSys.AutomatedTestting.Base.pdb
	Automation/MktDef3/bin/Release/nunit.framework.dll
	Automation/MktDef3/bin/Release/nunit.framework.xml
	Automation/MktDef3/obj/Release/MktDef3.pdb
	Automation/packages/NUnit.2.6.3/lib/nunit.framework.dll
	Automation/packages/NUnit.2.6.3/lib/nunit.framework.xml
	Automation/packages/Selenium.WebDriver.2.40.0/lib/net40/WebDriver.dll
Merge branch 'stage' into cristiv3

Conflicts:
	Automation/Automation.Base/Def4.cs
	Automation/Automation.Base/obj/Debug/PinInfoSys.AutomatedTestting.Base.csproj.FileListAbsolute.txt
	Automation/Automation.v11.suo
	Automation/MktDef2/obj/x86/Debug/MktDef2.csproj.FileListAbsolute.txt
automatic updates