Adding 404 error page
Merge branch 'develop'