Added some scaladoc in app.nlp.
Merge and fix conflict in app/nlp/phrase/Phrase.scala.