Content page added but not merged with Zifei's change
Merge branch 'master' of https://github.com/zifeishan/emotif

Zifei has made some modification before I know.
content page added but not chained up