Changed error pages
Merge branch 'dev' into beta