[IC] repairing problems from last merge
[IC] repairing problems from last merge
[IC] repairing problems from last merge
[IC] repairing problems from last merge
[IC] repairing problems from last merge
Merge remote-tracking branch 'remotes/origin/D578' into hc-branch

Conflicts:
	catalog/admin/templates/default.php