Merge branch 'release-4.0.0' of https://github.com/jim618/multibit-website into release-4.0.0

Conflicts:
	src/main/resources/views/html/en/index.html