TESTING

Conflicts:
	.travis.yml
	scripts/publish-docs.sh