use: valueObj.getJSONObject("bytes").getString("value");in the ClientResolveUtil.java。

fix bug: PUBLIC_KEY_SUFFIX = ".pub";
modify the default value,cons_parti.0.consensus.secure=false

# Conflicts:
#	source/deployment/deployment-peer/src/main/resources/scripts/startup.sh
#	source/gateway/src/main/java/com/jd/blockchain/gateway/web/BlockBrowserController.java

# Conflicts:
#	source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java
#	source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminAccount.java
#	source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java
#	source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java
#	source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/DefaultOperationHandleRegisteration.java
#	source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java
#	source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java
#	source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java
#	source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitProperties.java
#	source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ClientOperator.java
#	source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ConsensusParticipantData.java
#	source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java
#	source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
#	source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java
#	source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/Utils.java
#	source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/SettingsInit.java
#	source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java

# Conflicts:
#	source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
#	source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitCommand.java
#	source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitProperties.java

# Conflicts:
#	source/sdk/sdk-base/pom.xml
#	source/storage/storage-redis/pom.xml
#	source/storage/storage-service/pom.xml

2. Adding browser to get Settings configuration interface;

3. Repairing BUG of BftSMART Consensus.

* develop:
  Modify license files, readme files, and other configurations
  change configure files and shell files
  change configure files
  Fix bugs in test case;

# Conflicts:
#	README.md
#	source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoAlgorithm.java
#	source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/AsymmtricCryptographyImpl.java
#	source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/HashCryptographyImpl.java
#	source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/asymmetric/JNIED25519SignatureFunction.java
#	source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/hash/JNIRIPEMD160HashFunction.java
#	source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/hash/JNISHA256HashFunction.java
#	source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/asymmetric/AsymmtricCryptographyImplTest.java
#	source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/hash/HashCryptographyImplTest.java
#	source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIED25519UtilsTest.java
#	source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIMBSHA256UtilsTest.java
#	source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIRIPEMD160UtilsTest.java
#	source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNISHA256UtilsTest.java