小修改
Merge branch 'dev' of https://github.com/LJmengmengda/TimeBank into dev

Conflicts:
	src/client/common/Receiver.java
	src/client/common/Sender.java
小幅修改
Merge branch 'dev' of https://github.com/LJmengmengda/TimeBank into dev

Conflicts:
	src/client/backup/signup/娉ㄥ唽鍔熻兘