merge con Waldix
Merge branch 'configuracion' of https://github.com/manduks/Imobile into configuracion