Merge serg

Conflicts:
	src/test/resources/stories/livejournal/navigation/useful/header_navigation.story
	thucydides.properties