1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/xxjwd/transfer/Transfer.java
d