Error templates
404 errors on notfound
Force Error to call beforeFilter
Merge branch 'master' into test