created error layout and added 404 template [deliver #70663012]
Merge branch 'bugs/70663012' into dev