Update to latest Substrate & Polkadot and also move cli crate (#365)

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [
-	"cli",
+	"client/cli",
 	"client/consensus/common",
 	"client/consensus/relay-chain",
 	"client/network",

client/cli/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "cumulus-cli"
+name = "cumulus-client-cli"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"

rococo-parachains/Cargo.toml

@@ -56,7 +56,7 @@ sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "maste
 jsonrpc-core = "15.1.0"
 
 # Cumulus dependencies
-cumulus-cli = { path = "../cli" }
+cumulus-client-cli = { path = "../client/cli" }
 cumulus-client-consensus-relay-chain = { path = "../client/consensus/relay-chain" }
 cumulus-client-collator = { path = "../client/collator" }
 cumulus-client-service = { path = "../client/service" }

rococo-parachains/src/cli.rs

@@ -46,7 +46,7 @@ pub enum Subcommand {
 	ImportBlocks(sc_cli::ImportBlocksCmd),
 
 	/// Remove the whole chain.
-	PurgeChain(cumulus_cli::PurgeChainCmd),
+	PurgeChain(cumulus_client_cli::PurgeChainCmd),
 
 	/// Revert the chain to a previous state.
 	Revert(sc_cli::RevertCmd),