Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/huayuan/service/MemberServiceImpl.java
	src/main/java/com/huayuan/web/MemberController.java