add FF CountNonTerms
Merge ../mosesdecoder into hieu