2/12 tests completed

test basic retrieval and login/logout functionality
3/12 test completed

tests to see if a surfer's page can be retrieved
Merge branch '3.0-alvin' into 3.0-scott

Conflicts:
	test/test/IntegrationTest.java
	test/test/pages/package-info.java