forgot to fix conflicts in tornado_app
Merge branch 'hotfix/fix_conflix'