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