Merge branch 'master' into frontend
Revert fb577a7..7dda05b

This rolls back to commit fb577a711b24e52abb2463b6b217a88045d4acaf.
Merge pull request #21 from ciudadanointeligente/frontend

Frontend