FoodService poistettu turhana
RestaurantService poistettu turhana
Merge branch 'janluutest' of github.com:JaniL/wepaharkka into janluutest

Conflicts:
	src/main/java/unicaferater/service/FoodService.java