diff --git a/.travis.yml b/.travis.yml
index 85f093bd31..1d93de15b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ python:
 env:
   global:
   - VERSION="9.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0"
+  - WEBSITE_REPO="1"
   - TRANSIFEX_USER='transbot@odoo-community.org'
   - WEBSITE_REPO="1"
   - secure: eNfbQI7Pkp3mjTFQgjrVVldmyE/Yn3+iCMVykhXppC85dJaCFMpjwPUfZa7p38tnnH7jhng2JL2tAXnJ4uOry0B3m9xYR7fNYXg/9uj1988FHvpDhfDFEKcMF8s70mr11HRijj6U8p6WDt/0ygD6aZ0LJzWzxhMFecFavOb6XOw=
diff --git a/website_snippet_marginless_gallery/README.rst b/website_snippet_marginless_gallery/README.rst
new file mode 100644
index 0000000000..017763d789
--- /dev/null
+++ b/website_snippet_marginless_gallery/README.rst
@@ -0,0 +1,89 @@
+.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg
+    :alt: License: LGPL-3
+
+==========================
+Marginless Gallery Snippet
+==========================
+
+This module extends the functionality of the website module to add a new
+snippet that forms a marginless gallery and allow you to create a grid of
+photos that have no spaces between themselves.
+
+.. image:: ./images/marginless_gallery.png
+   :alt: Marginless gallery
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Edit any page in your website.
+* Go to *Insert blocks > Features*.
+* Drag the *Marginless Gallery* snippet anywhere in your page.
+* Choose a fixed height for all your images. This is required to maintain a
+  solid layout. Must be a number.
+    * If you still do not want the fixed height (maybe because your theme
+      applies it), just leave blank and press *Continue*.
+
+To change images, you need to:
+
+* Select any image block in the snippet you just created.
+* Go to *Customize > Background* and choose any background you want.
+    * Backgrounds will be centered and cover the whole element in any layout.
+
+To change the images height, you need to:
+
+* Select any block inside the snippet you just created.
+* Go to the top parent.
+* Go to *Customize > Change Images Height*.
+* Input a number and press *Continue*.
+
+To avoid trimming the images, you need to:
+
+* Select any block inside the snippet you just created.
+* Go to the top parent.
+* Go to *Customize > Do not trim images*.
+
+Known issues / Roadmap
+======================
+
+* If you do not set a fixed height to all your images in the snippet, it will
+  get an ugly layout. Right now we manually set the height, but whenever
+  Bootstrap 4 starts being used in Odoo with its flexbox support, this will not
+  be needed anymore.
+
+* Improve it using `Masonry <http://desandro.github.io/masonry/>`_ like the
+  `Graphene theme  <https://theme-graphene.odoo.com/page/blocks>`_ does. It
+  should allow to set arbitrary heights to images with a beautiful layout.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/website/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and
+welcomed feedback `here
+<https://github.com/OCA/website/issues/new?body=module:%20website_snippet_marginless_gallery%0Aversion:%208.0.1.0.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Jairo Llopis <j.llopis@grupoesoc.es>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/website_snippet_marginless_gallery/__init__.py b/website_snippet_marginless_gallery/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/website_snippet_marginless_gallery/__openerp__.py b/website_snippet_marginless_gallery/__openerp__.py
new file mode 100644
index 0000000000..cba260be30
--- /dev/null
+++ b/website_snippet_marginless_gallery/__openerp__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+{
+    "name": "Marginless Gallery Snippet",
+    "summary": "Add a snippet to have a marginless image gallery",
+    "version": "9.0.1.0.0",
+    "category": "Website",
+    "license": "LGPL-3",
+    "website": "https://odoo-community.org/project/website-maintainers-79",
+    "author": "Grupo ESOC Ingeniería de Servicios, "
+              "Tecnativa, "
+              "Odoo Community Association (OCA)",
+    "application": False,
+    "installable": True,
+    "images": [
+        "images/marginless_gallery.png",
+    ],
+    "depends": [
+        "website",
+    ],
+    "data": [
+        "views/assets.xml",
+        "views/snippets.xml",
+    ],
+    "demo": [
+        "demo/assets.xml",
+    ],
+}
diff --git a/website_snippet_marginless_gallery/demo/assets.xml b/website_snippet_marginless_gallery/demo/assets.xml
new file mode 100644
index 0000000000..9793774278
--- /dev/null
+++ b/website_snippet_marginless_gallery/demo/assets.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+<odoo>
+
+    <template id="demo_assets_editor" inherit_id="website.assets_editor">
+        <xpath expr=".">
+            <script type="text/javascript"
+                    src="/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.tour.js"/>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/website_snippet_marginless_gallery/i18n/de.po b/website_snippet_marginless_gallery/i18n/de.po
new file mode 100644
index 0000000000..75ea8a4dd1
--- /dev/null
+++ b/website_snippet_marginless_gallery/i18n/de.po
@@ -0,0 +1,81 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_snippet_marginless_gallery
+# 
+# Translators:
+# Rudolf Schnapka <rs@techno-flex.de>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: website (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-25 14:25+0000\n"
+"PO-Revision-Date: 2016-02-24 17:54+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: German (http://www.transifex.com/oca/OCA-website-8-0/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"All photos must have the same height or the\n"
+"                                gallery layout will be broken"
+msgstr "Alle Fotos müssen die gleiche Höhe haben, sonst\nwird Ihr Layout zerschossen"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Change Images Height"
+msgstr "Ändere Bildhöhe"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Do not trim images"
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:32
+#, python-format
+msgid "Height for all images in gallery"
+msgstr "Höhe aller Bilder in der Gallerie"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:33
+#, python-format
+msgid "Image height in pixels"
+msgstr "Bildhöhe in Pixeln"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Lorem ipsum"
+msgstr "Lorem ipsum"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna."
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Marginless Gallery"
+msgstr "Randlose Gallerie"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Our Gallery"
+msgstr "Unsere Gallerie"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid ""
+"section,\n"
+"            .carousel,\n"
+"            .parallax,\n"
+"            .marginless-gallery .img"
+msgstr "section,\n            .carousel,\n            .parallax,\n            .marginless-gallery .img"
diff --git a/website_snippet_marginless_gallery/i18n/es.po b/website_snippet_marginless_gallery/i18n/es.po
new file mode 100644
index 0000000000..82fbecdc2e
--- /dev/null
+++ b/website_snippet_marginless_gallery/i18n/es.po
@@ -0,0 +1,88 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* website_snippet_marginless_gallery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-28 13:01+0100\n"
+"PO-Revision-Date: 2015-12-28 13:01+0100\n"
+"Last-Translator: Jairo Llopis <j.llopis@grupoesoc.es>\n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.8.5\n"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"All photos must have the same height or the\n"
+"                                gallery layout will be broken"
+msgstr ""
+"Todas las fotos deben tener la misma altura o la maquetación de la galería "
+"se estropeará"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Change Images Height"
+msgstr "Cambiar la altura de las imágenes"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Do not trim images"
+msgstr "No recortar las imágenes"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:32
+#, python-format
+msgid "Height for all images in gallery"
+msgstr "Altura para todas las imágenes de la galería"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:33
+#, python-format
+msgid "Image height in pixels"
+msgstr "Altura de imagen en píxeles"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Lorem ipsum"
+msgstr "Lorem ipsum"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna."
+msgstr ""
+"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna."
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Marginless Gallery"
+msgstr "Galería sin margenes"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Our Gallery"
+msgstr "Nuestra galería"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid ""
+"section,\n"
+"            .carousel,\n"
+"            .parallax,\n"
+"            .marginless-gallery .img"
+msgstr ""
+"section,\n"
+"            .carousel,\n"
+"            .parallax,\n"
+"            .marginless-gallery .img"
diff --git a/website_snippet_marginless_gallery/i18n/it.po b/website_snippet_marginless_gallery/i18n/it.po
new file mode 100644
index 0000000000..9d575e93e3
--- /dev/null
+++ b/website_snippet_marginless_gallery/i18n/it.po
@@ -0,0 +1,82 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_snippet_marginless_gallery
+# 
+# Translators:
+# Paolo Valier, 2016
+# Paolo Valier, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: website (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-14 08:43+0000\n"
+"PO-Revision-Date: 2016-04-30 19:54+0000\n"
+"Last-Translator: Paolo Valier\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-website-8-0/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"All photos must have the same height or the\n"
+"                                gallery layout will be broken"
+msgstr "Tutte le foto devono avere la stessa altezza altrimenti\nla visualizzazione della galleria non sarà corretta"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Change Images Height"
+msgstr "Cambia l'altezza delle immagini"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Do not trim images"
+msgstr "Non tagliare le immagini"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:32
+#, python-format
+msgid "Height for all images in gallery"
+msgstr "Altezza per tutte le immagini della galleria"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:33
+#, python-format
+msgid "Image height in pixels"
+msgstr "Altezza delle immagini in pixels"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Lorem ipsum"
+msgstr "Lorem ipsum"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna."
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Marginless Gallery"
+msgstr "Galleria senza margini"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Our Gallery"
+msgstr "La nostra Galleria"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid ""
+"section,\n"
+"            .carousel,\n"
+"            .parallax,\n"
+"            .marginless-gallery .img"
+msgstr "section,\n.carousel,\n.parallax,\n.marginless-gallery .img"
diff --git a/website_snippet_marginless_gallery/i18n/pt_BR.po b/website_snippet_marginless_gallery/i18n/pt_BR.po
new file mode 100644
index 0000000000..196eabde42
--- /dev/null
+++ b/website_snippet_marginless_gallery/i18n/pt_BR.po
@@ -0,0 +1,81 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_snippet_marginless_gallery
+# 
+# Translators:
+# danimaribeiro <danimaribeiro@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: website (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-12 02:17+0000\n"
+"PO-Revision-Date: 2016-03-05 18:12+0000\n"
+"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-website-8-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"All photos must have the same height or the\n"
+"                                gallery layout will be broken"
+msgstr "Todas as fotos devem ter a mesma altura\nou o layout da galeria vai ficar desajeitado"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Change Images Height"
+msgstr "Mude a altura da imagem"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Do not trim images"
+msgstr "Não corte as imagens"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:32
+#, python-format
+msgid "Height for all images in gallery"
+msgstr "Altura para todas as imagens da galeria"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:33
+#, python-format
+msgid "Image height in pixels"
+msgstr "Altura da imagem em pixels"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Lorem ipsum"
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna."
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Marginless Gallery"
+msgstr "Galeria sem margem"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Our Gallery"
+msgstr "Nossa galeria"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid ""
+"section,\n"
+"            .carousel,\n"
+"            .parallax,\n"
+"            .marginless-gallery .img"
+msgstr ""
diff --git a/website_snippet_marginless_gallery/i18n/ru.po b/website_snippet_marginless_gallery/i18n/ru.po
new file mode 100644
index 0000000000..4e888ad51a
--- /dev/null
+++ b/website_snippet_marginless_gallery/i18n/ru.po
@@ -0,0 +1,76 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_snippet_marginless_gallery
+# 
+# Translators:
+# Mikhail - <expromt.core@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: website (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-19 11:34+0000\n"
+"PO-Revision-Date: 2016-01-15 21:24+0000\n"
+"Last-Translator: Mikhail - <expromt.core@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/oca/OCA-website-8-0/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"All photos must have the same height or the\n"
+"                                gallery layout will be broken"
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Change Images Height"
+msgstr "Изменить высоту изображений"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:32
+#, python-format
+msgid "Height for all images in gallery"
+msgstr "Высота для всех изображений в галерее."
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:33
+#, python-format
+msgid "Image height in pixels"
+msgstr "Высота изображений в пикселях"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Lorem ipsum"
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna."
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Marginless Gallery"
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Our Gallery"
+msgstr ""
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid ""
+"section,\n"
+"            .carousel,\n"
+"            .parallax,\n"
+"            .marginless-gallery .img"
+msgstr ""
diff --git a/website_snippet_marginless_gallery/i18n/sl.po b/website_snippet_marginless_gallery/i18n/sl.po
new file mode 100644
index 0000000000..c498045b69
--- /dev/null
+++ b/website_snippet_marginless_gallery/i18n/sl.po
@@ -0,0 +1,81 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_snippet_marginless_gallery
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015-2016
+msgid ""
+msgstr ""
+"Project-Id-Version: website (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-25 14:25+0000\n"
+"PO-Revision-Date: 2016-02-27 16:56+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-website-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"All photos must have the same height or the\n"
+"                                gallery layout will be broken"
+msgstr "Vse fotografije morajo imeti enako višino, da se\n                                postavitev galerije ne pokvari"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Change Images Height"
+msgstr "Spremeni višino slik"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid "Do not trim images"
+msgstr "Ne obrezuj slik"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:32
+#, python-format
+msgid "Height for all images in gallery"
+msgstr "Višina za vse slike v galeriji"
+
+#. module: website_snippet_marginless_gallery
+#. openerp-web
+#: code:addons/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js:33
+#, python-format
+msgid "Image height in pixels"
+msgstr "Višina slik v pikslih"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Lorem ipsum"
+msgstr "Lorem ipsum"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna."
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Marginless Gallery"
+msgstr "Galerija brez robov"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippets
+msgid "Our Gallery"
+msgstr "Naša galerija"
+
+#. module: website_snippet_marginless_gallery
+#: view:website:website.snippet_options
+msgid ""
+"section,\n"
+"            .carousel,\n"
+"            .parallax,\n"
+"            .marginless-gallery .img"
+msgstr "section,\n            .carousel,\n            .parallax,\n            .marginless-gallery .img"
diff --git a/website_snippet_marginless_gallery/images/marginless_gallery.png b/website_snippet_marginless_gallery/images/marginless_gallery.png
new file mode 100644
index 0000000000..981ea32c6b
Binary files /dev/null and b/website_snippet_marginless_gallery/images/marginless_gallery.png differ
diff --git a/website_snippet_marginless_gallery/static/description/icon.png b/website_snippet_marginless_gallery/static/description/icon.png
new file mode 100644
index 0000000000..b4dc7ca917
Binary files /dev/null and b/website_snippet_marginless_gallery/static/description/icon.png differ
diff --git a/website_snippet_marginless_gallery/static/description/icon.svg b/website_snippet_marginless_gallery/static/description/icon.svg
new file mode 100644
index 0000000000..9c79e97aba
--- /dev/null
+++ b/website_snippet_marginless_gallery/static/description/icon.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="79"
+   viewBox="0 0 35.433071 0"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="snippet_thumbnail.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="47.022606"
+     inkscape:cy="38.286246"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="960"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4151" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1173.3622)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:22.21289635px;line-height:80.00000119%;font-family:Sans;text-align:center;letter-spacing:-1.20000005px;word-spacing:0px;text-anchor:middle;fill:#717576;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="50.009296"
+       y="1194.1399"
+       id="text4157"
+       sodipodi:linespacing="80.000001%"><tspan
+         sodipodi:role="line"
+         id="tspan4159"
+         x="49.409294"
+         y="1194.1399"
+         dx="0 0 0 0"></tspan><tspan
+         sodipodi:role="line"
+         x="49.409294"
+         y="1211.9102"
+         id="tspan4161"></tspan><tspan
+         sodipodi:role="line"
+         x="49.409294"
+         y="1229.6805"
+         id="tspan4163"></tspan><tspan
+         sodipodi:role="line"
+         x="49.409294"
+         y="1247.4508"
+         id="tspan4165"></tspan></text>
+  </g>
+</svg>
diff --git a/website_snippet_marginless_gallery/static/src/css/website_snippet_marginless_gallery.sass b/website_snippet_marginless_gallery/static/src/css/website_snippet_marginless_gallery.sass
new file mode 100644
index 0000000000..a05d0854d7
--- /dev/null
+++ b/website_snippet_marginless_gallery/static/src/css/website_snippet_marginless_gallery.sass
@@ -0,0 +1,28 @@
+/*! Copyright 2015-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+    License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+
+.row .img
+    .marginless-gallery &
+        // As the name of the module says...
+        margin: 0px
+
+        // Background changes depending on div and layout size
+        background:
+            size: cover
+            position: center
+            repeat: no-repeat
+
+        // Center inner text
+        display: table
+        text-align: center
+        > div
+            display: table-cell
+            vertical-align: middle
+
+        // Ensure images get displayed if content is removed
+        &:empty
+            display: block
+
+    // Do not trim images
+    .marginless-gallery-contain &
+        background-size: contain
diff --git a/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js b/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js
new file mode 100644
index 0000000000..f0bddafdf2
--- /dev/null
+++ b/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js
@@ -0,0 +1,53 @@
+/* Copyright 2015-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+ * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). */
+
+odoo.define('website_marginless_gallery.gallery', function(require) {
+    "use strict";
+    var _t = require("web.core")._t;
+    var Dialog = require("web.Dialog");
+    var options = require('web_editor.snippets.options');
+    var website = require("website.website");
+
+    return options.registry.marginless_gallery = options.Class.extend({
+        auto_remove: function () {
+            return this.$target.data("overlay")
+                .find(".oe_snippet_remove").click();
+        },
+
+        drop_and_build_snippet: function () {
+            this.change_images_height("click")
+                .fail($.proxy(this, "auto_remove"));
+            return this._super.apply(this, arguments);
+        },
+
+        change_images_height: function (type) {
+            if (type !== "click") return;
+            return website.prompt({
+                window_title: _t("Height for all images in gallery"),
+                input: _t("Image height in pixels"),
+
+            }).then(
+                $.proxy(this, "images_height_changed"),
+                $.proxy(this, "images_height_failed")
+            );
+        },
+
+        images_height_changed: function (pixels) {
+            // Must be a number
+            pixels = Number(pixels);
+            if (isNaN(pixels)) {
+                return $.Deferred().reject(pixels);
+            }
+            this.$target
+                .find(".row > .img")
+                .css("height", pixels ? pixels + "px" : "");
+        },
+
+        images_height_failed: function (pixels) {
+            return pixels && Dialog.alert(
+                this,
+                _.str.sprintf(_t("%s is not a valid value"), pixels)
+            );
+        }
+    });
+});
diff --git a/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.tour.js b/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.tour.js
new file mode 100644
index 0000000000..4240566653
--- /dev/null
+++ b/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.tour.js
@@ -0,0 +1,74 @@
+/* Copyright 2015-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+ * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). */
+
+odoo.define("web_module_name.tour", function (require) {
+    "use strict";
+    var base = require("web_editor.base");
+    var Tour = require("web.Tour");
+
+    return base.ready().done($.proxy(Tour, "register", {
+        id: "marginless_gallery",
+        name: "Insert a marginless gallery snippet",
+        path: "/",
+        mode: "test",
+        steps: [
+            {
+                title: "Edit the homepage (1)",
+                waitFor: "button[data-action=edit]",
+                element: "button[data-action=edit]",
+            },
+            {
+                title: "Drag and drop a marginless gallery snippet (1)",
+                waitFor: ".oe_snippet:contains('Marginless Gallery'):visible",
+                snippet: ".oe_snippet:contains('Marginless Gallery')",
+            },
+            {
+                title: "Cancel modal dialog",
+                waitFor: ".modal button:contains('Cancel'):visible",
+                element: ".modal button:contains('Cancel'):visible",
+            },
+            {
+                title: "Drag and drop a marginless gallery snippet (2)",
+                waitFor: ".oe_snippet:contains('Marginless Gallery'):visible",
+                snippet: ".oe_snippet:contains('Marginless Gallery')",
+            },
+            {
+                title: "Set no fixed height",
+                waitFor: ".modal .btn-primary:visible",
+                element: ".modal .btn-primary:visible",
+            },
+            {
+                title: "Click on the snippet to see options",
+                waitNot: ".modal:visible",
+                element: "#wrap .marginless-gallery",
+            },
+            {
+                title: "Click on Customize",
+                waitFor: "#wrap .marginless-gallery, \
+                          .btn-primary:contains('Customize'):visible",
+                element: ".btn-primary:contains('Customize'):visible",
+            },
+            {
+                title: "Click on Change Images Height",
+                element: "li[data-change_images_height]:visible a",
+            },
+            {
+                title: "Set image height of 200px",
+                waitFor: ".modal-body input:visible",
+                element: ".modal-body input:visible",
+                sampleText: "200",
+            },
+            {
+                title: "Accept modal dialog",
+                waitFor: ".modal input:contains('200'):visible",
+                element: ".modal .btn-primary:visible",
+            },
+            {
+                title: "Check that the right height has been saved",
+                waitNot: ".modal:visible",
+                waitFor: "#wrap .marginless-gallery \
+                          .col-md-3[style*='height: 200px']",
+            },
+        ],
+    }));
+});
diff --git a/website_snippet_marginless_gallery/tests/__init__.py b/website_snippet_marginless_gallery/tests/__init__.py
new file mode 100644
index 0000000000..0367e9e537
--- /dev/null
+++ b/website_snippet_marginless_gallery/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+
+from . import test_ui
diff --git a/website_snippet_marginless_gallery/tests/test_ui.py b/website_snippet_marginless_gallery/tests/test_ui.py
new file mode 100644
index 0000000000..c5ec3c7bf3
--- /dev/null
+++ b/website_snippet_marginless_gallery/tests/test_ui.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+
+from openerp.tests.common import HttpCase
+
+
+class UICase(HttpCase):
+    def test_admin_tour_marginless_gallery(self):
+        self.phantom_js(
+            "/",
+            "odoo.__DEBUG__.services['web.Tour'].run('marginless_gallery')",
+            "odoo.__DEBUG__.services['web.Tour'].tours.marginless_gallery",
+            "admin")
diff --git a/website_snippet_marginless_gallery/views/assets.xml b/website_snippet_marginless_gallery/views/assets.xml
new file mode 100644
index 0000000000..6f0809915a
--- /dev/null
+++ b/website_snippet_marginless_gallery/views/assets.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2015-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+<odoo>
+
+<template id="assets_frontend"
+          inherit_id="website.assets_frontend"
+          name="Marginless gallery styles">
+    <xpath expr=".">
+        <link rel="stylesheet"
+              href="/website_snippet_marginless_gallery/static/src/css/website_snippet_marginless_gallery.sass"/>
+    </xpath>
+</template>
+
+<template id="assets_editor" inherit_id="website.assets_editor">
+    <xpath expr=".">
+        <script type="text/javascript"
+                src="/website_snippet_marginless_gallery/static/src/js/website_snippet_marginless_gallery.editor.js"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/website_snippet_marginless_gallery/views/snippets.xml b/website_snippet_marginless_gallery/views/snippets.xml
new file mode 100644
index 0000000000..77c1948744
--- /dev/null
+++ b/website_snippet_marginless_gallery/views/snippets.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2015-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+<odoo>
+
+    <template id="s_marginless_gallery" name="Marginless Gallery">
+        <section class="marginless-gallery mt16 mb32">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 text-center">
+                        <h2>Our Gallery</h2>
+                        <h3 class="text-muted">
+                            All photos must have the same height or the
+                            gallery layout will be broken
+                        </h3>
+                    </div>
+                    <section class="img col-sm-6 col-md-3 oe_img_bg" style="background-image: url('/website/static/src/img/banner/wood.jpg');">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_green">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_img_bg" style="background-image: url('/website/static/src/img/banner/business_guy.jpg');">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_blue_light">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_blue">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_orange">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_purple">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_black">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_dark">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 col-md-3 oe_img_bg" style="background-image: url('/website/static/src/img/banner/mountains.jpg');">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 oe_red col-md-3">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                    <section class="img col-sm-6 oe_img_bg col-md-3" style="background-image: url('/website/static/src/img/parallax/parallax_bg.jpg');">
+                        <div>
+                            <h3>Lorem ipsum</h3>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+                            </p>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </section>
+    </template>
+
+    <template id="snippets" inherit_id="website.snippets">
+        <xpath expr="//div[@id='snippet_feature']//div[@class='o_panel_body']">
+            <t
+                t-snippet="website_snippet_marginless_gallery.s_marginless_gallery"
+                t-thumbnail="/website_snippet_marginless_gallery/static/description/icon.png"/>
+        </xpath>
+    </template>
+
+    <template id="snippet_options" inherit_id="website.snippet_options">
+        <xpath expr=".">
+            <div data-js="marginless_gallery"
+                 data-selector=".marginless-gallery">
+                <li data-change_images_height="" data-only="click">
+                    <a>Change Images Height</a>
+                </li>
+                <li data-toggle_class="marginless-gallery-contain">
+                    <a>Do not trim images</a>
+                </li>
+            </div>
+        </xpath>
+    </template>
+
+</odoo>