merge
merge
merge
modified css, bug correction in article comments,deleted useless routes and some navigation optimisation
merge