master 1
Merge branch 'develop'

Conflicts:
	src/test/A.java
master：2
master；2
Merge branch 'develop'
Merge branch 'develop'
dev1: 1