Merge master into develop in preparation for deleting master

Author: jackzampolin

x/mint/client/module_client.go

@@ -1,12 +1,12 @@
 package client
 
 import (
-	"github.com/spf13/cobra"
-	"github.com/tendermint/go-amino"
+    "github.com/spf13/cobra"
+    "github.com/tendermint/go-amino"
 
-	sdkclient "github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/x/mint"
-	"github.com/cosmos/cosmos-sdk/x/mint/client/cli"
+    sdkclient "github.com/cosmos/cosmos-sdk/client"
+    "github.com/cosmos/cosmos-sdk/x/mint"
+    "github.com/cosmos/cosmos-sdk/x/mint/client/cli"
 )
 
 type ModuleClient struct {