Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/springapp/mvc/contacts/service/ContactsOperateService.java
	src/main/resources/mybatis/mapper/UserMapper.xml
	src/test/java/com/springapp/mvc/contacts/service/ContactsOperateServiceTest.java
	src/test/java/com/springapp/mvc/contacts/service/ContactsSearchServiceTest.java