title and subtitle task
social network fine advance
almost done the task about social network
social network task done thanks GOD
Merge branch 'Ideas_daniel' into editing
Merge branch 'Pre-Master' into editing
Merge branch 'Ideas_daniel' into editing
Merge remote-tracking branch 'origin/victor_jobs' into editing

Conflicts:
	index.php
featured post task almost ending
finishing the last two task
Deleting Something

I just start deleting some thing that we dont need.
Merge branch 'Ideas_daniel' into editing

Conflicts:
	lib/social_network_pane.php
Merge remote-tracking branch 'origin/victor_jobs' into editing
Merge branch 'editing' into Pre-Master
Before Meeting

Premaster antes de la junta de maniana
Merge branch 'editing' into Pre-Master
- Maquetación opciones del tema backend
- He reorganizado todos sources, los he simplificado, aún se podría hacer una simplificación más... pero creo que de momento se puede dejar así
- Erick queda ahora tu maquetación