extract-ghkm: add --STSG option
makemteval and small change to tokenizer. /Tom Hoar and Tomas Fulajtar
Merge branch 'master' of github.com:moses-smt/mosesdecoder
extract-ghkm: change STSG output format.
Bug fix in a sanity check in PrefixTree.h
bug when compiled --with-mm but not using simulated post-editing
Merge ../mosesdecoder into hieu