Merge branch 'feature/package' into dev

Conflicts:
	.gitignore

diff --cc .gitignore
index 6a3359c9b900c1753fe0a43082c2d29247e99763,7645dc4c8d4c9c9ed4929569a7663514c52ca0d1..127fa30736aebb26a8095238f0171e43b4d72bdf
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -14,12 -13,10 +13,9 @@@ develop-egg
  .installed.cfg
  *.directory
  var
- data/static
- data/mysql
- data/postgresql
- data/var
  .thumbnails
  .tmp
 -doc
+ *.lock
  
  # Installer logs
  pip-log.txt

diff --cc docker-compose.yml
index 0e36aff855e861ae1973b4aabf7293843cbbb08b,adbde559ed3257dacabba9781fa12d19df8b2b15..5aeb4d4d65d0dff464d18cfaf2aa38a8eb172aef
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -18,15 -18,13 +18,14 @@@
  # Authors:
  # Guillaume Pellerin <guillaume.pellerin@ircam.fr>
  
- 
- data:
+ var:
    image: debian:jessie
    volumes:
-     - ./data/media/:/srv/media
-     - ./data/backup/:/srv/backup
+     - ./var/media:/srv/media
+     - ./var/backup:/srv/backup
      - /srv/static
      - /srv/bower
 +    - ./doc:/srv/doc
    command: "true"
  
  db:
@@@ -44,17 -41,16 +42,17 @@@ app
    build: .
    command: /bin/bash scripts/app.sh
    volumes:
-     - ./app/:/srv/app
-     - ./data/var/log/uwsgi/:/var/log/uwsgi
-     - ./lib/grappelli-safe/:/srv/lib/grappelli-safe
-     - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda
-     - ./lib/django-eve/:/srv/lib/django-eve
-     - ./lib/django-prestashop/:/srv/lib/django-prestashop
+     - ./app:/srv/app
+     - ./var/log/uwsgi:/var/log/uwsgi
+     - ./lib/grappelli-safe:/srv/lib/grappelli-safe
+     - ./lib/mezzanine-agenda:/srv/lib/mezzanine-agenda
+     - ./lib/django-eve:/srv/lib/django-eve
+     - ./lib/django-prestashop:/srv/lib/django-prestashop
      # - ./lib/mezzanine/:/srv/lib/mezzanine
      # - ./lib/cartridge/:/srv/lib/cartridge
 +    - ./doc:/srv/doc
    volumes_from:
-     - data
+     - var
    expose:
      - "8000"
    links:

diff --cc etc/nginx/conf.d/default.conf
index 0000000000000000000000000000000000000000,decdcff4f7bbe16224dcbd6c10e14b61c52ae6bc..1b1a92833984a52960e21c1899d50aed4857bb2b
mode 000000,100644..100644
--- /dev/null
--- 2/etc/nginx/conf.d/default.conf
+++ b/etc/nginx/conf.d/default.conf
@@@ -1,0 -1,26 +1,32 @@@
+ server_tokens off;
+ 
+ server {
+        listen 80;
+        charset utf-8;
+ 
+        access_log /var/log/nginx/app-access.log;
+        error_log /var/log/nginx/app-error.log;
+ 
+        # max upload size
+        client_max_body_size 4096M; # adjust to taste
+ 
+        # Django media
+        location /media {
+                       alias /srv/media; # your Django project's media files - amend as required
+        }
++
+        # Django static
+        location /static {
+                alias /srv/static; # your Django project's static files - amend as required
+        }
+ 
++       # Django static
++       location /doc {
++               alias /srv/doc; # your Django project's static files - amend as required
++       }
++
+        location / {
+            uwsgi_pass app:8000;
+            include /etc/nginx/uwsgi_params;
+        }
+ }