Added handling for 404 errors.
Added a 404 not found view.
Merge branch 'develop-404-error' into develop