* master:
  upgraded the version of parent project and the submodule projects;
  upgraded utils;

# Conflicts:
#	core
#	deploy/pom.xml
#	framework
#	libs/bft-smart
#	libs/utils
#	samples/pom.xml
#	test

* master:
  upgraded submodules;
  upgraded versions of modules;
  upgraded submodules;
  unified public key format
  upgraded framework, core and utils;

# Conflicts:
#	core
#	deploy/pom.xml
#	samples/pom.xml
#	test

* master:
  upgraded version of bft-smart;
  upgraded version to 1.4.1.RELEASE;
  upgraded dependency of binary proto;
  upgraded the dependency of utils;
  upgraded the depending versions of utils project and binaryproto project;
  upgraded modules to rename the importing packages of utils;
  renamed the importing packages of http service agent framework;
  upgraded submodules to fix compilation error;
  added new module: libs/httpservice;
  renamed the importing packages of http service agent framework;
  upgraded binary-proto module;
  upgraded binary-proto module;
  added new modules;
  renamed the importing packages of binary-proto;
  refactored the structure of projects;
  added new libs;

# Conflicts:
#	core
#	deploy/deploy-gateway/pom.xml
#	deploy/deploy-peer/pom.xml
#	deploy/docker/docker-demo/pom.xml
#	deploy/docker/docker-sdk/pom.xml
#	deploy/docker/pom.xml
#	deploy/pom.xml
#	samples/pom.xml
#	test

* release/1.4.0:
  upgraded bft-mart module;
  upgraded version of core module and bft-smart module;
  modify sdk version,  compile, import package error
  optimized the default values of bftsmart.config;
  upgraded version of kvdb;
  upgraded versions of submodules;
  upgraded the version of core;
  upgraded version to 1.4.0.RELEASE;
  fix deactive node command line  error
  fix shell error
  modify version to 1.4.0 release, and add miss code
  init release 1.4.0;
  Update repo.sh
  Update repo.sh Fix remote config error in the first time.
  Renamed the types in ledger database for more appropriate expression;
  completed extracting crypto data types as interface;
  upgraded framework and core;
  updated framework;

# Conflicts:
#	deploy/deploy-peer/src/main/resources/scripts/active-parti.sh
#	deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh
#	explorer
#	samples/pom.xml
#	samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java
#	samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_InsertData_Demo.java
#	samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_Contract_Test.java
#	samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java