Drupal Gallery
Merge branch 'master' of https://github.com/aguenee/opp into feature_galerie
Style Gallery
FIX conflict