Merge branch 'release/1.6.4' of github.com:Parisson/Telemeta into release/1.6.4

Conflicts:
	app/scripts/app.sh

diff --cc .dockerignore
index a692b3d6e8525bba7beb4f56c304e58ae9e1535c,a692b3d6e8525bba7beb4f56c304e58ae9e1535c..af1ea76ec70535c0b1d4d6dfbc3533a9e7baed84
--- 1/.dockerignore
--- 2/.dockerignore
+++ b/.dockerignore
@@@ -1,7 -1,7 +1,6 @@@
  .git
  *.pyc
  *.egg-info
--app/
  build/
  dist/
  data/