test
test
web
test
test
modify java bean
commit dao and service
update pom.xml
Merge branch 'develop' into test

Conflicts:
	source/server/nourriture-web/src/main/java/edu/bjtu/nourriture_web/action/TestAction.java
	source/server/nourriture-web/src/main/java/edu/bjtu/nourriture_web/dao/TestDao.java
	source/server/nourriture-web/src/main/java/edu/bjtu/nourriture_web/service/TestService.java
	source/server/nourriture-web/src/main/webapp/WEB-INF/applicationContext.xml