utf8 to ansi
Merge branch 'master' of github.com:zyxnero/niu-x2-sidebar

Conflicts:
	README.md
	static/js/niu2.js
	templates/article_sidebar.html