Merge branch 'master' into download

Conflicts:
	src/client/client.go
	src/client/genericwallet.go
	src/quorum/quorum.go