Merge pull request #48 from adoulrac/rachid/release2

Rachid/release2
Improvements in tabbed pictures controller