first version complete
Merge branch 'tongtong'
merge css and js
Merge branch 'tongtong'