1.2 steps
fixed
fixes
step 2
Merge pull request #40 from alexivanov84/branch#9

social
Merge pull request #41 from alexivanov84/_aro_

 aro
3 step
merged
Merge origin/_aro_

Conflicts:
	system/protected/controllers/back/MarketingWizardController.php
	system/protected/views/back/marketingWizard/partials/web_pages.php
Merge origin/_aro_

Conflicts:
	system/protected/controllers/back/MarketingWizardController.php
	system/protected/views/back/marketingWizard/partials/web_pages.php
Merge origin/_aro_

Conflicts:
	system/protected/controllers/back/MarketingWizardController.php
	system/protected/views/back/marketingWizard/partials/web_pages.php
social