fix bugs
Merge branch 'develop' of git://github.com/herenwei/Coevery into herenwei-develop
refactor
Merge branch 'develop' of https://github.com/Coevery/Coevery into develop