Update template
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/loca/html/mod_loca_social/default.php