* release/1.5.0:
  upgraded dependencies;
  upgraded version to 1.5.0.RELEASE;
  initialized the release 1.5.0 branch ;
  upgraded the version of parent project and the submodule projects;
  upgraded utils;

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

* 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

* 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

# Conflicts:
#	project/dependencies/pom.xml
#	test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java