fixed foreign field not posting to item table as kitchen_id
Merge branch 'master' of github.com:michaelchu/foodmark

Conflicts:
	app/controllers/dishes_controller.rb
	app/controllers/kitchens_controller.rb
Updated dishes form to include dish type