Merge branch 'master' into app-model-extension

Conflicts:
	src/shogun2-core/shogun2-model/src/main/java/de/terrestris/shogun2/model/Application.java