Merge remote-tracking branch 'origin/CompetitiveNER' into CompetitiveNER

Conflicts:
	wolfe-examples/src/main/scala/ml/wolfe/examples/NERExample.scala