adding zip for temporarily
adding zip temporarily
fixing
Revert "adding zip temporarily"

This reverts commit 4ae0480ebd8a46f50b3c2a536d2531a9fd915b5b.
Revert "adding zip for temporarily"

This reverts commit 707b6ec6c8001cd33a8043de4bc7163624121b39.
Chris Lee : Updated to use to NUnit 2.5.10, included the whole NUnit folder structure to avoid problems when building in non 2.0 environments
Chris Lee: Testing CI build
Chris Lee : Updated to use Webdriver 2.25.1 (for Net 4.0)
Chris Lee : Removed old webdriver DLLs
Merge branch 'master' into hashes-in-request-fix
fixing
Tom: Slight renaming of added methods
Tom: Making sure that we consistently name member variables
Tom: Upgrading the version of NUnit
Tom: Renaming NUnit folder to reflect that it is no longer 2.9
Tom: Including packaing Plasma.Http
Merge branch 'upgrades' of https://github.com/tomwscott/plasma into tomwscott-upgrades
Merge branch 'tomwscott-upgrades'

Conflicts:
	Plasma.proj
	src/Plasma.Test.Functional/Plasma.Test.Functional.csproj
	src/Plasma.Test.Unit/Plasma.Test.Unit.csproj
	tools/NUnit-2.5.9/lib/failure.png
	tools/NUnit-2.5.9/lib/inconclusive.png
	tools/NUnit-2.5.9/lib/log4net.dll
	tools/NUnit-2.5.9/lib/nunit.uiexception.dll
	tools/NUnit-2.5.9/lib/skipped.png
	tools/NUnit-2.5.9/lib/success.png
	tools/NUnit-2.6.3/lib/Images/Tree/Default/Failure.png
	tools/NUnit-2.6.3/lib/Images/Tree/Default/Inconclusive.png
	tools/NUnit-2.6.3/lib/Images/Tree/Default/Skipped.png
	tools/NUnit-2.6.3/lib/Images/Tree/Default/Success.png
	tools/NUnit-2.6.3/lib/log4net.dll
	tools/NUnit-2.6.3/lib/nunit.uiexception.dll
	tools/NUnit/lib/Failure.png
	tools/NUnit/lib/Ignored.png
	tools/NUnit/lib/Inconclusive.png
	tools/NUnit/lib/Skipped.png
	tools/NUnit/lib/Success.png
	tools/NUnit/lib/fit.dll
	tools/NUnit/lib/log4net.dll
	tools/NUnit/lib/nunit-console-runner.dll
	tools/NUnit/lib/nunit-gui-runner.dll
	tools/NUnit/lib/nunit.core.interfaces.dll
	tools/NUnit/lib/nunit.fixtures.dll
	tools/NUnit/lib/nunit.uiexception.dll
	tools/NUnit/lib/nunit.uikit.dll
	tools/NUnit/lib/nunit.util.dll
	tools/NUnit/nunit-console-x86.exe.config
	tools/NUnit/nunit-console.exe