i dont even know whats new anymore..
Merge remote-tracking branch 'origin/noServBranch' into ClientDevelopment

Conflicts:
	ClientUnitTest/FakesAssemblies/WebApplication1.Fakes.dll
	ClientUnitTest/FakesAssemblies/WebApplication1.Fakes.xml
	WebApplication1/Form.aspx
	WebApplication1/Form.aspx.cs