merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/l/mk/servlet/EncryptionServlet.java
	src/test/java/com/l/mk/utils/ByteUtilTest.java