save
Merge branch 'master' into maaTuey

Conflicts:
	app/models/TopRecipe.php
	app/routes.php
	app/views/Comment.blade.php
category
search ingredient ,comment,topRecipe