NgramFilter & termLock problem fixed.
Merge branch 'phase2.5_TermLock_NGramFilterRevision' into
phase2.5_optimizing_code