close #43
Merge branch 'milestone-3' of https://github.com/jortal/Surferpedia into milestone-3

Conflicts:
	test/tests/IntegrationTest.java