no message
Merge branch 'bugfix/YCB-12' into develop

Conflicts:
	protected/models/Item.php
	protected/modules/mall/views/item/_view.php