mail.ru
try
actions
fixes mail
permit is_banned
fix feature
permit status_id
description
permit
Merge branch 'master' into develop

Conflicts:
	features/step_definitions/add_coupon_steps.rb