Merge branch 'master' into develop
Update the data files. Add a script to update them
Merge branch 'develop'
Merge branch 'master' of https://github.com/CitiSent/candidatometro
Merge branch 'master' into develop
Merge branch 'elDorado'
Update the de-que-hablan layout and color
Merge branch 'develop'
Merge branch 'master' of https://github.com/CitiSent/candidatometro
Merge branch 'master' into elDorado