bug
Merge branch 'stephys' of https://github.com/ReyesMagos/viveencasa into stephys

Conflicts:
	vive_en_casa_web/package.json