ajustes
Merge branch 'master' into elDorado
Merge branch 'master' into elDorado
Minor changes
Correcciones menores al texto
Merge branch 'release-1.0' into develop
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
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/CitiSent/candidatometro into develop
Add the grunt files
Minify and concatenate the javascript files
Merge branch 'single-js' into develop
Switch to the minified versions of javascript files
Merge branch 'single-js' into develop
Update the gruntfile