Merge remote-tracking branch 'upstream/dev' into dev

diff --cc app/deploy/app.sh
index 37b13b9feeb88ae607d3709fcc8cea789dfeed26,9593c324ddfe0d7fb8a43a402bf6fb0f01834d4c..4e5d6d8a8b538b55a9b624e8ecf6b6a623bfbafb
--- 1/app/deploy/app.sh
--- 2/app/deploy/app.sh
+++ b/app/deploy/app.sh
@@@ -21,16 -21,11 +21,14 @@@ gid='www-data
  # stating apps
  # pip install django-angular
  
- # waiting for other services
+ # waiting for other network services
  sh $app/deploy/wait.sh
  
- # waiting for available database
- python $app/wait.py
- 
 +#fix contains haystack elasticsearch
 +cd /opt/miniconda/lib/python2.7/site-packages/haystack/backends && sed -i "s/'contains': u'%s'/'contains': u'*%s*'/g" elasticsearch_backend.py && cd $app
 +
- # django init
+ # django setup
+ python $manage wait-for-db
  python $manage syncdb --noinput
  python $manage migrate --noinput
  python $manage bower_install -- --allow-root