fix name of  project
Merge branch '7.0' into 8.0

Conflicts:
	.travis.yml