Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/CitiSent/candidatometro into gh-pages
Merge branch 'develop'
Merge branch 'master' into gh-pages
Merge branch 'master' into elDorado
fb like con credenciales de cadidatometro App
Merge branch 'gh-pages' into elDorado
Merge branch 'master' into develop
Reparación del LESS y alternativa de gestión
Merge branch 'gh-pages' into elDorado

Conflicts:
	css/candidatometro.css
Textos home, responsive totals y color para ciudadanía
Merge branch 'elDorado'
Merge branch 'master' into develop
Update the baseurl
Update the data files