Merge branch 'master' into liveness

Conflicts:
	.idea/ant.xml
	PartialPreprocessor/src/main/scala/de/fosd/typechef/lexer/options/FeatureModelOptions.java
Merge branch 'liveness' of github.com:ckaestne/TypeChef into liveness