To.do: Logos sociales
Merge branch 'Ideas_daniel' into editing

Conflicts:
	lib/social_network_pane.php