Added additional rules

Added And Rule which is similar to new OrRule
renamed ChoiceRule to OrRule
added super class for logical rules