Merge origin/master

Conflicts:
	thucydides.properties
Merge origin/master

Conflicts:
	thucydides.properties
Merge origin/master

Conflicts:
	thucydides.properties
Merge master into work

Conflicts:
	src/test/resources/stories/livejournal/friends/manage_friends_groups.story
Merge master into work

Conflicts:
	src/test/resources/stories/livejournal/friends/manage_friends_groups.story
Merge master into work

Conflicts:
	src/test/resources/stories/livejournal/friends/manage_friends_groups.story
Merge master into work

Conflicts:
	src/test/resources/stories/livejournal/friends/manage_friends_groups.story
Merge master into work

Conflicts:
	src/test/resources/stories/livejournal/friends/manage_friends_groups.story