Merge branch 'master' of https://github.com/CoCreate-app/CoCreate-conditional-logic

Author: frankpagan