Updated 404 page
Merge remote branch 'origin/7.x-1.x' into 7.x-1.x