Added 404 and 500 error pages
Merge branch 'dev' into beta
Merge branch 'beta'