Merge branch 'master' into verifier-waits

Conflicts:
	client/client.go
	client/config.go
	client/defaults.go
	client/profile.go
	dnmgr/dnmgr/main.go
	dnmgr/persistence.go
	server/backnet.go
	server/communicator.go
	server/communicator_test.go
	server/db.go
	server/frontend.go
	server/frontend_test.go
	server/main.go
	server/merklemap.go
	server/merklemap_test.go
	server/message.go
	server/messagebroker.go
	server/messagebroker_test.go
	server/policy.go
	server/prng.go
	server/prng_test.go
	server/server.go
	server/server_test.go