test
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
Merge branch 'develop' into test
Merge branch 'develop' into test
write a simple test case
temp
temp
temp
temp
temp
temp
temp
all test case about manuFacturer
Merge branch 'test'

Conflicts:
	source/server/nourriture-web/src/main/java/edu/bjtu/nourriture_web/bean/User.java