added condition types
Merge branch 'develop' of github.com:sdbmich1/plumboard into condition-types-110514