finish the foodrestfulservice except recommend.but lacation and food
restfulsevice without test!
Locationrestfulservice has been tested
addService of foodRestfulService has been tested!
correct the error of locationrestfulservive
update customer
commit recipe
confict
Merge branch 'develop' of
https://github.com/PracticalTraining/nourriture into develop

Conflicts:
	source/server/nourriture-web/src/main/java/edu/bjtu/nourriture_web/dao/RegionDao.java
	source/server/nourriture-web/src/main/java/edu/bjtu/nourriture_web/idao/IRegionDao.java
	source/server/nourriture-web/src/main/webapp/WEB-INF/applicationContext.xml
test delete region restful service
test region's servide
test recipeCategoryrestfulService and rengionrestfulService
test the get,delete,put of foodrestfulservice.but the other
restfulservice don't finish
test getsuperior service
test all service and pase test
correct manufacture services
Merge branch 'develop'
correct
Merge branch 'develop'
temp
Merge branch 'test'