css fixed
Merge branch 'master' into develop
Updated the changelog v1.0
Merge branch 'release-1.0'
Merge branch 'release-1.0' into develop
Add the s3 configuration file
Merge branch 'hotfix-1.0.1'
Update the version number
Merge branch 'hotfix-1.0.1'
Update the s3 base url
Merge branch 'hotfix-1.0.2'
Update the endpoint url
Merge branch 'hotfix-1.0.3'
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