Merge branch 'dev'

diff --cc app/wsgi.sh
index 847389f9177d88bec38a41558d0e1f52a9a4ca4d,ca4238f8ece85b05cc518c02220f20a703b2e803..90c7eb97246e85481b66c7df500194c493899d07
--- 1/app/wsgi.sh
--- 2/app/wsgi.sh
+++ b/app/wsgi.sh
@@@ -9,14 -9,6 +9,17 @@@ src='/srv/src/
  uwsgi_log='/var/log/uwsgi/app.log'
  debug_log='/var/log/app/debug.log'
  
++<<<<<<< HEAD
 +# uwsgi params
 +port=8000
 +processes=32
 +http_timeout=120
 +#threads=2
 +autoreload=3
 +uid='www-data'
 +gid='www-data'
++=======
++>>>>>>> dev
  # patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
  
  # Install a package in development mode