merge conflicts

CRM/Civirules/Action.php

CRM/Civirules/BAO/Action.php

CRM/Civirules/BAO/Condition.php

CRM/Civirules/BAO/Event.php

CRM/Civirules/BAO/Rule.php

CRM/Civirules/Condition.php

CRM/Civirules/DAO/Action.php

CRM/Civirules/Engine.php

CRM/Civirules/Event/EditEntity.php

CRM/Civirules/Upgrader.php

CRM/CivirulesActions/Form/GroupContact.php

CRM/CivirulesActions/GroupContact.php

CRM/CivirulesConditions/FirstContribution.php

api/v3/CiviRuleAction/Create.php

api/v3/CiviRuleAction/Get.php

api/v3/CiviRuleCondition/Create.php

api/v3/CiviRuleCondition/Get.php

api/v3/CiviRuleEvent/Create.php

api/v3/CiviRuleRule/Create.php

sql/createCiviruleAction.sql