merge
Merge branch 'master' of ssh://github.com/DamienBen-Faro/iZicabClient
resa done