This should fix it Nafiri

memorial_id replaced in Database.php
Merge branch 'master' of https://github.com/whatknows/epilogue

Conflicts:
	includes/config.php