crf + logs
Merge branch 'master' of https://github.com/fabio-oesch/imvs8.businessCardReader

Conflicts:
	BusinessCardReader/src/ch/fhnw/imvs8/businesscardreader/testingframework/crf/createtestdata/ModelGenerator.java