dev for 7
new fenzhi1 for 8
new for master
conflict fixed
dev test
with no ff
fix 404 bug
merge fixed bug 404