[master] Improve design
Merge branch 'master' of github.com:souvir/projet-mobile
[master] Fix conflicts