Merge Parisson/dev + add DATASTART env

diff --cc app/scripts/app.sh
index b0a8f8ae2ca69aa6a129752944639b14a005894b,1f2568a6220aa9f0fb83e03f0982b4907d6d362e..7053ff92ac8e6e27660d14a39a1596758b1cf7d4
--- 1/app/scripts/app.sh
--- 2/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@@ -30,14 -30,9 +30,16 @@@ python $manage migrate --noinpu
  python $manage bower_install -- --allow-root
  python $manage collectstatic --noinput
  
- if [ ! -f .init ]; then
-     chown -R www-data:www-data $media
-     python $manage telemeta-create-admin-user
-     python $manage telemeta-create-boilerplate
-     touch .init
- elif [ $REINDEX = "True" ]; then
+ # telemeta setup
++if [ $DATASTART = "True" ]
++then
+ python $manage telemeta-create-admin-user
+ python $manage telemeta-create-boilerplate
++fi
++
++if [ $REINDEX = "True" ]; then
 +    python $manage rebuild_index --noinput
 +fi
  
  if [ $DEBUG = "False" ]; then
      python $manage update_index --workers $processes &

diff --cc env/debug.env
index 7a9fbbcc2efd668f22107e8e9316a87bd0755b0f,465d6beb4bed37ee63ca51e043996469cda2acd2..f43f7d26c85c43fa8e4d859932316f4eab91db5a
--- 1/env/debug.env
--- 2/env/debug.env
+++ b/env/debug.env
@@@ -17,5 -17,3 +17,6 @@@ BROKER_URL=redis://broker:6379/
  
  # If this is True, all tasks will be executed locally by blocking until the task returns.
  CELERY_ALWAYS_EAGER=False
- REINDEX=True
 +
++REINDEX=False
++DATASTART=False

diff --cc telemeta/locale
index 66caac4dce0b50451e5755e42240444ad33e9647,ea6605ad78243d798d88f1ffc46c8f6bc507ce11..0790c8f8c2df57d782176710d73795734d034111
--- 1/telemeta/locale
--- 2/telemeta/locale
+++ b/telemeta/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 66caac4dce0b50451e5755e42240444ad33e9647
 -Subproject commit ea6605ad78243d798d88f1ffc46c8f6bc507ce11
++Subproject commit 0790c8f8c2df57d782176710d73795734d034111

diff --cc telemeta/templates/telemeta/lists.html
Simple merge

diff --cc telemeta/views/home.py
Simple merge