Merge pull request #19 from imom0/feature_articles

Add update view
Merge pull request #20 from imom0/feature_articles

Remove action url in template
Fix database default Collation to utf8_unicode_ci in README
Merge pull request #22 from imom0/translates

Add translate for articles
#12 Refactor articles blurprint
Merge branch 'feature_articles' of github.com:ScriptFan/ScriptFan.com into feature_articles

Conflicts:
	website/scriptfan/messages.pot
	website/scriptfan/templates/articles/form.html
	website/scriptfan/translations/zh_CN/LC_MESSAGES/messages.mo
	website/scriptfan/views/articles.py
Fix merge conflicts