Added Search functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/food_instance.php
	app/models/restaurant.php