Rudimentary image uploading
Merge branch 'master' into imgupload
Save images to database; distinguish between restaurant and food images
(still untested)
Add relationships, etc
Merge branch 'master' into imgupload

Conflicts:
	app/models/food_instance.php
	app/models/food_type.php
	app/models/restaurant.php
	app/routes.php
Tiny fix to ImageController.
NOTE: If food_instance_food_type_id is renamed to food_instance_food_types_id in the food_images table, please change line 25 correspondingly.
Basic home page
Merge branch 'imgupload'