Merge branch 'master' into develop

# Conflicts:
#	deploy/deploy-peer/pom.xml

deploy/deploy-peer/pom.xml

@@ -62,6 +62,18 @@
 			<version>${core.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>tools-keygen-booter</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>storage-service</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
 		<!-- <dependency> <groupId>com.jd.blockchain</groupId> <artifactId>gateway</artifactId> 
 			<version>${project.version}</version> </dependency> -->