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

fixed the bug: get 10+ results by /accounts/.../entries?fromIndex=10&count=10, no results in the seconds page;
delete the modules of stp/state-transfer/crypto-impl;
delete the dependency out the dependencyManagement

# Conflicts:
#	source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java
#	source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java
#	source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java
#	source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
#	source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTestAll4Redis.java

ledgers/{ledgerHash}/accounts/{address}/entries-version
test OK.

2. Adding browser to get Settings configuration interface;

3. Repairing BUG of BftSMART Consensus.