Merge pull request #116 from b3log/1.1.0

1.1.0
Merge pull request #118 from b3log/1.1.0

1.1.0
.
.
.
#119
.
Merge pull request #120 from b3log/master

rebase