wfcqevcadcAD
Merge branch 'master' of https://github.com/holdera/ShareYourCulture

Conflicts:
	editrecipe.php
	editrestaurant.php