Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
	app/organization/shop/urls.py
	app/organization/urls.py

diff --cc app/organization/shop/urls.py
index 6164c0bbb29133fd595237ab5419b0c06c9f2398,0000000000000000000000000000000000000000..524bc4869086b51d6cf50b7d3999ff9c22960b71
mode 100644,000000..100644
--- 1/app/organization/shop/urls.py
--- /dev/null
+++ b/app/organization/shop/urls.py
@@@ -1,14 -1,0 +1,15 @@@
 +from __future__ import unicode_literals
 +
 +import django.views.i18n
 +from django.conf.urls import patterns, include, url
 +from django.conf.urls.i18n import i18n_patterns
 +
 +from mezzanine.core.views import direct_to_template
 +from mezzanine.conf import settings
 +
 +from organization.shop.views import *
 +
 +urlpatterns = [
 +    url("^shop/", include("cartridge.shop.urls")),
++    url("^product/(?P<slug>.*)/$", ProductDetailView.as_view(), name='shop_product'),
 +]

diff --cc app/organization/shop/views.py
index 44b18f22f5050f7a94ad610c95f0a1123be5f1d7,0000000000000000000000000000000000000000..d338301c5d0a1486e64f7b6f856005fa5bc4ba48
mode 100644,000000..100644
--- 1/app/organization/shop/views.py
--- /dev/null
+++ b/app/organization/shop/views.py
@@@ -1,17 -1,0 +1,22 @@@
 +from django.shortcuts import render
 +
 +from organization.projects.models import *
 +from organization.core.views import *
 +
 +
 +# class ProjectListView(ListView):
 +#
 +#     model = Project
 +#     template_name='projects/project_list.html'
 +#
 +#
 +# class ProjectDetailView(SlugMixin, DetailView):
 +#
 +#     model = Project
 +#     template_name='projects/project_detail.html'
 +#     context_object_name = 'project'
++
++
++class ProductDetailView(SlugMixin, DetailView):
++
++    pass