Merge branch 'master' into liying

Conflicts:
	src/main/java/com/liying/Test.java
Merge branch 'liying'