added custom 404 error page
merged master to get the custom 404