better handling of 404 and 500 in dev environment + suggest most similar page in case of 404
Merge remote-tracking branch 'origin/master'