merge refactring et modification gui into master