Merge branch 'dev' into release/1.7

diff --cc app/scripts/app.sh
index 83d0bd2a5f74248cb0f1783224e9d844bb9c5466,21d6daaf6db016f50b912e4715ba8b42ed575733..667a9c7fbccbcf1f4697d8912ad7b0512f22b5f3
--- 1/app/scripts/app.sh
--- 2/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@@ -26,16 -22,21 +26,19 @@@ pip install -e git+https://github.com/P
  
  # waiting for other network services
  sh $app/scripts/wait.sh
 -
 -# django setup
  python $manage wait-for-db
 -python $manage syncdb --noinput
 -python $manage migrate --noinput
 -python $manage bower_install -- --allow-root
 -python $manage collectstatic --noinput
  
 -# telemeta setup
 -python $manage telemeta-create-admin-user
 -python $manage telemeta-create-boilerplate
 +# initial setup
 +if [ ! -f .init ]; then
 +    bash $app/scripts/init.sh
 +    touch .init
 +fi
 +
 +python $manage bower_install -- --allow-root
  
+ # Delete Timeside database if it exists
+ cat /srv/src/telemeta/scripts/sql/drop_timeside.sql | python $manage dbshell
+ 
  if [ $REINDEX = "True" ]; then
      python $manage rebuild_index --noinput
  fi

diff --cc app/settings.py
Simple merge