test fixed, 404 template added
Merge remote-tracking branch 'origin/master'