Merge pull request #21 from ciudadanointeligente/frontend

Frontend
Merge branch 'master' into frontend