Conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/giveback/views/site/news_sidebar.php
	themes/luckybuys/views/site/news_sidebar.php
	themes/riderplus/views/site/news_sidebar.php
	themes/sportscash/views/site/news_sidebar.php