Fixed computation of lexical scores.
Items under 'generic' now included in libmoses'
Added call to tp->Evaluate(src) before adding a phrase table entry to the TargetPhraseCollection during lookup.
Fixed missing #include.
Fixed missing #include.
Merge branch 'master' of github.com:moses-smt/mosesdecoder

Conflicts:
	moses/Jamfile