Fix bug in basic alignment rules

a new configuration needs to be also aligned to an inferred
configuration (?if) => reference added to make skolem
Fix expected test outcome for Li

there is just one expected test outcomeq
Clean up all tests for the review - no fails
Add R&W Gold and Screen Resolution
fix rule bug for review

NOTE: conflict resolution C3 has been removed for the review as it has
still a bug.
fix NP set of Chirs
Merge pull request #15 from Cloud4AllTUD/review3

Review3 - Bug fixing, tests of all scenarios