update by serjio
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/rostovik/views/site/news.php
Merge remote-tracking branch 'origin/master'
update by serjio
update by serjio
Merge remote-tracking branch 'origin/master'