Merge branch 'master' into frontend
Merge pull request #40 from ciudadanointeligente/frontend

Merge branch 'master' into frontend