ajustes
Merge branch 'master' into elDorado
Merge branch 'master' into elDorado
Minor changes
Correcciones menores al texto
nuevos templates
Merge branch 'elDorado' into embeds

Conflicts:
	css/candidatometro.css
Páginas embed funcionando
Merge branch 'embeds' into develop
limpieza y corrección de link en el pie de embeds
Merge branch 'embeds' into develop