changed 404 page
updated 500 page
Merge branch 'feature/abc'