CONDITION COMBINATION RULE(AND, OR) CAN BE ADDED WHEN USER TRY
TO ADD ADDITIONAL COUPON CONDITION.
EXTRA DROPDOWN FOR CONDITION RULE INTO COUPON ADD AND EDIT FORM.
COUPON LOGIC UPDATED FOR APPLYING COMBINATION OF COUPON CONDITION
RULES.
Rollback
Remove newline at the end of files.
Merge pull request #375 from 9thsphere/issue-159

Issue 159 - Add more functionality to coupon conditions.