Merge branch 'master' into dev/accesstoken2

# Conflicts:
#	DynamicKey/AgoraDynamicKey/cpp/sample/RtcTokenBuilder2Sample.cpp
#	DynamicKey/AgoraDynamicKey/cpp/src/AccessToken2.h
#	DynamicKey/AgoraDynamicKey/cpp/src/RtcTokenBuilder2.h
#	DynamicKey/AgoraDynamicKey/cpp/test/AccessToken2_test.cpp
#	DynamicKey/AgoraDynamicKey/go/src/accesstoken2/accesstoken.go
#	DynamicKey/AgoraDynamicKey/go/src/accesstoken2/accesstoken_test.go
#	DynamicKey/AgoraDynamicKey/go/src/accesstoken2/util.go
#	DynamicKey/AgoraDynamicKey/go/src/accesstoken2/util_test.go
#	DynamicKey/AgoraDynamicKey/go/src/rtctokenbuilder2/rtctokenbuilder.go
#	DynamicKey/AgoraDynamicKey/go/src/rtctokenbuilder2/rtctokenbuilder_test.go
#	DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/media/AccessToken2.java
#	DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/media/RtcTokenBuilder2.java
#	DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/media/Utils.java
#	DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/rtm/RtmTokenBuilder2.java
#	DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/sample/AccessTokenInspector.java
#	DynamicKey/AgoraDynamicKey/java/src/test/java/io/agora/media/AccessToken2Test.java
#	DynamicKey/AgoraDynamicKey/java/src/test/java/io/agora/media/RtcTokenBuilder2Test.java
#	DynamicKey/AgoraDynamicKey/java/src/test/java/io/agora/rtm/RtmTokenBuilder2Test.java
#	DynamicKey/AgoraDynamicKey/nodejs/package-lock.json
#	DynamicKey/AgoraDynamicKey/nodejs/package.json
#	DynamicKey/AgoraDynamicKey/nodejs/src/AccessToken2.js
#	DynamicKey/AgoraDynamicKey/nodejs/src/RtcTokenBuilder2.js
#	DynamicKey/AgoraDynamicKey/php/sample/AccessToken2Sample.php
#	DynamicKey/AgoraDynamicKey/php/sample/RtcTokenBuilder2Sample.php
#	DynamicKey/AgoraDynamicKey/php/src/AccessToken2.php
#	DynamicKey/AgoraDynamicKey/php/src/RtcTokenBuilder2.php
#	DynamicKey/AgoraDynamicKey/php/src/RtmTokenBuilder2.php
#	DynamicKey/AgoraDynamicKey/php/src/Util.php
#	DynamicKey/AgoraDynamicKey/php/test/AccessToken2Test.php
#	DynamicKey/AgoraDynamicKey/php/test/RtcTokenBuilder2Test.php
#	DynamicKey/AgoraDynamicKey/php/test/RtmTokenBuilder2Test.php
#	DynamicKey/AgoraDynamicKey/python/sample/RtcTokenBuilder2Sample.py
#	DynamicKey/AgoraDynamicKey/python/src/AccessToken2.py
#	DynamicKey/AgoraDynamicKey/python/src/Packer.py
#	DynamicKey/AgoraDynamicKey/python/src/RtcTokenBuilder2.py
#	DynamicKey/AgoraDynamicKey/python/test/AccessToken2Test.py
#	DynamicKey/AgoraDynamicKey/python/test/RtcTokenBuilder2Test.py
#	DynamicKey/AgoraDynamicKey/python3/sample/RtcTokenBuilder2Sample.py
#	DynamicKey/AgoraDynamicKey/python3/src/AccessToken2.py
#	DynamicKey/AgoraDynamicKey/python3/src/Packer.py
#	DynamicKey/AgoraDynamicKey/python3/src/RtcTokenBuilder2.py
#	DynamicKey/AgoraDynamicKey/python3/test/AccessToken2Test.py
#	DynamicKey/AgoraDynamicKey/python3/test/RtcTokenBuilder2Test.py
#	DynamicKey/AgoraDynamicKey/ruby/lib/dynamic_key2.rb
#	DynamicKey/AgoraDynamicKey/ruby/lib/dynamic_key2/access_token.rb
#	DynamicKey/AgoraDynamicKey/ruby/lib/dynamic_key2/rtc_token_builder.rb
#	DynamicKey/AgoraDynamicKey/ruby/lib/dynamic_key2/util.rb
#	DynamicKey/AgoraDynamicKey/ruby/test/dynamic_key2/access_token_spec.rb
#	DynamicKey/AgoraDynamicKey/ruby/test/dynamic_key2/rtc_token_builder_spec.rb