Merge branch 'master' of git://github.com/ckaestne/TypeChef

Conflicts:
	CRewrite/src/test/scala/de/fosd/typechef/crewrite/FileTests.scala
	CTypeChecker/src/main/scala/de/fosd/typechef/typesystem/CExprTyping.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
	CTypeChecker/src/test/scala/de/fosd/typechef/typesystem/StructTest.scala
	Frontend/src/main/scala/de/fosd/typechef/Frontend.scala
	Frontend/src/main/scala/de/fosd/typechef/FrontendOptions.java
	PartialPreprocessor/src/main/scala/de/fosd/typechef/lexer/Main.java
	project/Build.scala