fucking picture view almost re-done after bsod
conflict of empty lines ^^
Merge pull request #57 from adoulrac/greyna/PictureController

Greyna/picture controller