Merge remote-tracking branch 'origin/master' into tests
Merge branch 'master' into tests
stash pop!
Tests
removed annoying files
Merge remote-tracking branch 'origin/master'

Conflicts:
	ClientUnitTest/FakesAssemblies/WebApplication1.Fakes.dll
	ClientUnitTest/FakesAssemblies/WebApplication1.Fakes.messages
Not logged in tests
Merge remote-tracking branch 'origin/master' into tests

Conflicts:
	ClientUnitTest/ControllerUnitTest.cs
Added tests to check for notLoggedIn and Non-admin access to admin functions
Merge branch 'tests' into ClientDevelopment
Test commit.