back to 3.1.0
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
prep for v0.5.14
bumped to v0.5.14 release
Merge branch 'release-3.1.0'
Merge branch 'develop'
Merge branch 'master' of https://github.com/jim618/multibit-website
Merge branch 'develop'

Conflicts:
	src/main/resources/views/html/en/releases.html
just touched te file to get it to deploy
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	src/main/resources/views/html/en/help.html
prep for release 0.5.15
merged in some changes I accidentally put on master
Merge branch 'develop' of ssh://github.com/jim618/multibit-website into develop
 more support help