Merge remote-tracking branch 'origin/master' into tests
Merge branch 'master' into tests
stash pop!
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
fixes
Tests resolved
Merge remote-tracking branch 'origin/tests' into helenaTests

Conflicts:
	ClientUnitTest/ControllerUnitTest.cs
tests