Merge pull request #318 from harmjanwestra/master

Interaction analysis update
Fix in the interaction model
Fix in the conditional analysis, moved resetting the maxNrMostSignificantEQTLs to the function that determines the SNP-probe combos, so it gets reset every time the function is called (happens in classes extending MetaQTL3)