Merge remote-tracking branch 'upstream/master'

Conflicts:
	CParser/src/test/scala/de/fosd/typechef/parser/c/CParserTest.scala
	CParser/src/test/scala/de/fosd/typechef/parser/c/ConsistencyTest.scala
	CParser/src/test/scala/de/fosd/typechef/parser/c/TestHelper.scala
	CRewrite/src/main/scala/de/fosd/typechef/crewrite/ConditionalControlFlow.scala
	CRewrite/src/main/scala/de/fosd/typechef/crewrite/Liveness.scala
	CRewrite/src/test/scala/de/fosd/typechef/crewrite/ASTNavigationTest.scala
	CTypeChecker/src/main/scala/de/fosd/typechef/typesystem/CDeclTyping.scala
	CTypeChecker/src/main/scala/de/fosd/typechef/typesystem/CTypeEnv.scala
	CTypeChecker/src/main/scala/de/fosd/typechef/typesystem/CTypeSystem.scala
	CTypeChecker/src/main/scala/de/fosd/typechef/typesystem/CTypes.scala
	FeatureExprLib/src/main/scala/de/fosd/typechef/featureexpr/FeatureExprParser.scala
	FeatureExprLib/src/main/scala/de/fosd/typechef/featureexpr/bdd/BDDFeatureExpr.scala
	FeatureExprLib/src/main/scala/de/fosd/typechef/featureexpr/sat/SATFeatureModel.scala
	Frontend/src/main/scala/de/fosd/typechef/Frontend.scala
	Frontend/src/main/scala/de/fosd/typechef/FrontendOptions.java
	ParserFramework/src/main/scala/de/fosd/typechef/parser/MultiFeatureParser.scala
	PartialPreprocessor/src/main/scala/de/fosd/typechef/lexer/Main.java
	PartialPreprocessor/src/main/scala/de/fosd/typechef/lexer/options/LexerOptions.java
	project/Build.scala