Fixed error in detokenization
Merge branch 'master' of github.com:neubig/travatar

Conflicts:
	script/analysis/gen_analysis_sheet.py
Merge branch 'master' of github.com:neubig/travatar