Merge branch 'master' of https://github.com/cobble19/takeaway.git

Conflicts:
	src/main/webapp/manager/ta/app/view/locationarea/LocationAreaController.js
1. finish foodSeller.