Added 404 and 500 error handlers
Merge branch 'master' into aufildusouffle