Fix server tests dependencies
Merge branch 'staging' of github.com:davinov/shame into staging

Conflicts:
	.travis.yml