Fixed issue (#51) with feature combinations in preprocessor annotations.
Extended fix for #74 for recently introduced invariants in outline.
Merge branch 'master' of https://github.com/tthuem/FeatureIDE.git