Added 404- and 500 pages
Bugfixing filenames containing slash
Merge branch 'master' into testing