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

Resolve CSS conflict issues & Test finished
Upgrade bower version to 1.0.0
Merge pull request #6 from LyuGGang/develop

Upgrade bower version to 1.0.0
Merge pull request #7 from teambullback/develop

Merge to Master