Agregado medidores. TODO: testear
Merge branch 'master' of github.com:mdemicheli/miniature-happiness