Merge branch 'nlp2' into openNLP_1
Merge branch 'openNLP_1' into nlp2