committing local changes and merging local
Merge branch 'master' of https://github.com/PearsonCCsoC/SeeTestAutomation

Conflicts:
	Pearson.PSCAutomation.212App/App.config
	Pearson.PSCAutomation.212App/NotebookCommonMethods.cs
	Pearson.PSCAutomation.212App/NotebookTests.cs
	Pearson.PSCAutomation.212App/Pearson.PSCAutomation.212App.csproj
	Pearson.PSCAutomation.212App/Xml/Controls.xml
	Pearson.PSCAutomation.v12.suo
	Pearson.PSCAutomation/AutomationAgent.cs