Add "or" option between "Current User Condition" and "Entry Condition"

[dlindberg]

Ability to use an or condition between user and entry conditions in addition to the default and condition. For example always show this field to admins and conditionally show it if users have done something. The specific use case I have at the moment is keeping an eye on what some auto populated fields that allow for user overrides are up to. I want to always be able to see them, but only want users to see them when they are being overridden.