Added 404.html
404.html fix
Merge branch 'beta'