Merge done
Changes in tabbed controller
Merge pull request #48 from adoulrac/rachid/release2

Rachid/release2