Some more work
Merge branch 'master' of https://github.com/atoader/dbwa

Conflicts:
	img/kitchen_bck.jpg
	recipe_details.php