add junit test case for service
add junit test case for service
commit to solve error
commit to solve problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/springapp/mvc/contacts/dao/UserMapper.java
	src/main/java/com/springapp/mvc/contacts/domain/Department.java
	src/main/java/com/springapp/mvc/contacts/domain/User.java
	src/main/java/com/springapp/mvc/contacts/service/ContactService.java
	src/main/java/com/springapp/mvc/contacts/web/controller/MainController.java
	src/main/resources/applicationContext.xml
	src/main/resources/jdbc.properties
	src/main/resources/mybatis/mapper/UserMapper.xml
	src/main/schema/weibangong_db.sql
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	src/test/java/com/springapp/mvc/ContactServiceTest.java