Merge branch 'master' into develop
case 2437 - Fixed image size.
Merge branch 'case-2437' into develop

* case-2437:
  case 2437 - Fixed image size.
case 2416 - Fixed campaign rule settings.
case 2416 - Remove field_camp_pane_id.
case 2416 - Added new rule types.
case 2416 - Fixed coding style.
Merge branch 'case-2416' into develop

* case-2416:
  case 2416 - Fixed coding style.
  case 2416 - Added new rule types.
  case 2416 - Remove field_camp_pane_id.
  case 2416 - Fixed campaign rule settings.
case 2416 - Fixed library rule.
Merge branch 'case-2416' into develop

* case-2416:
  case 2416 - Fixed library rule.
case 2416 - Fixed autocomplete issue.
Merge branch 'case-2416' into develop

* case-2416:
  case 2416 - Fixed autocomplete issue.
Merge remote-tracking branch 'origin/develop'

* origin/develop:
  case 2416 - Fixed autocomplete issue.
  case 2416 - Fixed library rule.
  case 2416 - Fixed coding style.
  case 2416 - Added new rule types.
  case 2416 - Remove field_camp_pane_id.
  case 2416 - Fixed campaign rule settings.
  case 2437 - Fixed image size.