Fixed unicode bug v2

Rebasing
Merge branch 'master' of https://github.com/TrungACZNE/flask

Rebased