* master:
  upgraded core and framework;
  fixed bugs that no error detail is displayed while error occurred;

# Conflicts:
#	deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java

* commit '61ad0cd7bf5dd3d69e5c6b4cf358f1f08f651de4':
  gateway
  upgraded submodules;
  upgraded submodules;
  upgraded submodules and fixed bugs;
  upgraded submodules;
  refactored BlockchainQueryService;
  upgraded utils;
  update samples
  upgraded core module;
  upgraded explorer and utils;

update samples

See merge request jd-blockchain/jdchain!28

* 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

unified public key format

See merge request jd-blockchain/jdchain!27

* 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