added error pages
Merge branch 'dev'