add NonTermContext property
Merge ../mosesdecoder into hieu