Fixed issues with the new conditional logic flyout in the GF 2.5. form editor. (#5)
Fixed issue where any merge tag rule value was replaced instead of only our merge tags.
Fixed issue with Gravity Forms 2.5 where field containers no longer used list items.