Add handlers for 404 and 500, improve translations
Merge branch 'develop'