Merge branch 'master' of https://github.com/janmotl/PredictorFactory.git

Conflicts:
	PredictorFactory/bin/.gitignore