Authored by lore-w

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop