Merge pull request #1317 from st4lk/locale_context

Locale context (pgettext support)

diff --cc tornado/test/gettext_translations/extract_me.py
Simple merge

diff --cc tornado/test/locale_test.py
Simple merge