ok
Merge https://github.com/manuelblanch/Aplicacio_android_sintesi