deactivate pgp plugin, unnecessary for now
attempt to use new scala version
Merge branch 'master' into Scala2.10

Conflicts:
	project/Build.scala
Merge branch 'XtcIntegration' into Scala2.10
Merge branch 'master' into Scala2.10

Conflicts:
	CParser/build.sbt
	CRewrite/build.sbt
	ParserFramework/src/main/scala/de/fosd/typechef/parser/MultiFeatureParser.scala
	project/Build.scala
	project/plugins.sbt
rename macro and then which are now scala keywords in 2.10
rewrite code with eq since Product no longer implements AnyRef in 2.10
avoid reliance on Kiama which has changed interface since last version
fix test case

depended on a specific scala version before
removed debug file
change to scala 2.10.1 and reintroduce kiama for CParser test
reduce initial BDD size

problematic with cross-build tests, since multiple instances are created
push version to 3.5, update readme with changes
update parameter list with genpages.sh
fix interface inference for "extern inline" functions
splitting tests, adding (failing) test for parameter function
fix marking of parameters and inference of functions with regard to parameters

previously function pointers in parameters could be mistaken for function names
updated tests
updated bdd defaults
update FeatureModelFactory interface

 * allow user-defined variable-name prefix instead of hard-coded CONFIG_
 * better error message on failed assert