Merge pull request #1 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #2 from ciudadanointeligente/production

Merge pull request #1 from ciudadanointeligente/master