Merge branch 'master' into develop

* 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

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

@@ -37,6 +37,7 @@ public class PeerBooter {
 			HomeContext homeContext = HomeBooter.createHomeContext(args);
 			startPeer(homeContext);
 		} catch (Exception e) {
+			System.err.println("Error!!! --[" + e.getClass().getName() + "] " + e.getMessage());
 			e.printStackTrace();
 		}
 	}