Resolve CSS conflict issues & Test finished
Merge pull request #5 from LyuGGang/develop

Resolve CSS conflict issues & Test finished