Merge branch 'master-links123'
# Conflicts:
# CHANGELOG.md
# assets/example.html
# lib/App.js
# lib/App.js.map
# lib/components/CommentBox/index.js.map
# lib/components/CommentList/index.js.map
# lib/components/ContentItem/index.js.map
# lib/components/Editor/Upload.js.map
# lib/components/Editor/index.js.map
# lib/components/ImagePreviewer/ImagePreviewer.js.map
# lib/index.js.map
# lib/lang/index.js.map
# src/App.js