testing
Merge branch 'master' of https://github.com/katrinatviglink/examples

Conflicts:
	scala_nlp_tests/src/main/scala/com/viglink/scala_nlp_tests/TrainSemiCRF.scala
	scala_nlp_tests/src/main/scala/com/viglink/scala_nlp_tests/testfeatures.scala