Merge origin/master

Conflicts:
	application/views/front_end/includes/socials_widget.php