fixed the ticket https://tracker.reisys.com/browse/DG-1803
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	themes/wordpress/category.php
fixed the ticket https://tracker.reisys.com/browse/DG-1803