fix 404 page
life updates
Merge branch 'develop'