fixed 404 page
Merge branch 'stable'