Merge branch 'master' into dev

diff --cc app/bin/app.sh
index 0390cef093cdc4469ca915fed1a6d00ea62388f5,0390cef093cdc4469ca915fed1a6d00ea62388f5..b37b7e81eb5a6b8a496dd295f5570340f8133728
--- 1/app/bin/app.sh
--- 2/app/bin/app.sh
+++ b/app/bin/app.sh
@@@ -25,7 -25,7 +25,7 @@@ gid='www-data
  # pip install -e /srv/lib/mypackage...
  
  # Install (staging) libs
--/srv/bin/build/local/setup_lib.sh
++# /srv/bin/build/local/setup_lib.sh
  
  # waiting for other services
  sh $app/bin/wait.sh