Merge branch 'master' into develop

* master:
  Upgrade the version of Jetty dependencies to fix security vulnerabilities;
  Modify license files, readme files, and other configurations, and generate 0.8.3.RELEASE versions

# Conflicts:
#	source/base/pom.xml
#	source/binary-proto/pom.xml
#	source/consensus/consensus-bftsmart/pom.xml
#	source/consensus/consensus-framework/pom.xml
#	source/consensus/consensus-mq/pom.xml
#	source/consensus/pom.xml
#	source/contract/contract-framework/pom.xml
#	source/contract/contract-jvm/pom.xml
#	source/contract/contract-maven-plugin/pom.xml
#	source/contract/contract-model/pom.xml
#	source/contract/pom.xml
#	source/crypto/crypto-adv/pom.xml
#	source/crypto/crypto-framework/pom.xml
#	source/crypto/pom.xml
#	source/deployment/deployment-gateway/pom.xml
#	source/deployment/deployment-peer/pom.xml
#	source/deployment/pom.xml
#	source/gateway/pom.xml
#	source/ledger/ledger-core/pom.xml
#	source/ledger/ledger-model/pom.xml
#	source/ledger/pom.xml
#	source/peer/pom.xml
#	source/pom.xml
#	source/runtime/pom.xml
#	source/runtime/runtime-context/pom.xml
#	source/runtime/runtime-modular-booter/pom.xml
#	source/runtime/runtime-modular/pom.xml
#	source/sdk/pom.xml
#	source/sdk/sdk-base/pom.xml
#	source/sdk/sdk-client/pom.xml
#	source/sdk/sdk-samples/pom.xml
#	source/storage/pom.xml
#	source/storage/storage-composite/pom.xml
#	source/storage/storage-redis/pom.xml
#	source/storage/storage-rocksdb/pom.xml
#	source/storage/storage-service/pom.xml
#	source/test/pom.xml
#	source/test/test-consensus-client/pom.xml
#	source/test/test-consensus-node/pom.xml
#	source/test/test-integration/pom.xml
#	source/test/test-ledger-core/pom.xml
#	source/tools/pom.xml
#	source/tools/tools-capability/pom.xml
#	source/tools/tools-initializer-booter/pom.xml
#	source/tools/tools-initializer/pom.xml
#	source/tools/tools-keygen-booter/pom.xml
#	source/tools/tools-keygen/pom.xml
#	source/utils/pom.xml
#	source/utils/utils-common/pom.xml
#	source/utils/utils-http/pom.xml
#	source/utils/utils-serialize/pom.xml
#	source/utils/utils-test/pom.xml
#	source/utils/utils-web-server/pom.xml
#	source/utils/utils-web/pom.xml

LICENSE

@@ -192,7 +192,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

source/pom.xml

@@ -41,7 +41,7 @@
 	<properties>
 		<my.utils.version>0.8.1-SNAPSHOT</my.utils.version>
 		<bft-smart.version>0.0.8.RELEASE</bft-smart.version>
-		<browser.version>0.6.4.RELEASE</browser.version>
+		<browser.version>0.6.6.RELEASE</browser.version>
 		<!-- <spring.framework.version>4.3.4.RELEASE</spring.framework.version> -->
 		<!-- <spring.mongo.version>1.9.3.RELEASE</spring.mongo.version> <spring.dao.version>2.0.8</spring.dao.version> 
 			<spring.security.version>4.2.0.RELEASE</spring.security.version> -->
@@ -66,7 +66,7 @@
 		<mockito.version>1.10.19</mockito.version>
 
 		<httpclient.version>4.5.1</httpclient.version>
-		<jetty.version>9.4.12.v20180830</jetty.version>
+		<jetty.version>9.4.17.v20190418</jetty.version>
 		<shiro.version>1.2.3</shiro.version>
 
 		<disruptor.version>3.3.6</disruptor.version>