Merge pull request #46 from adoulrac/rachid/release2

Rachid/release2
Merge pull request #47 from adoulrac/rachid/release2

Merge branch 'master' of github.com:adoulrac/IHM into rachid/release2
Merge done
Changes in tabbed controller