Merge branch 'feature/haystack' into dev

Conflicts:
	app/deploy/start_app.sh

diff --cc README.rst
index c7f6a7f7ccfbfeb629c6249d1381743af358b8e9,f3955ee476dc66bf8bf1822ac6f391e9b78ca814..c5231c9470421966b6c7e4e902dfcf643f5912c2
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -120,23 -120,9 +120,23 @@@ First install `Git <http://git-scm.com/
      cd Telemeta
      docker-compose up
  
- You can now browse http://localhost:8000 to get the web interface.
+ You can now browse http://localhost:8000
  
  
 +Restore / backup
 +================
 +
 +To restore a backuped database, put your backup file in data/backup, then in another terminal::
 +
 +    docker-compose run db /srv/backup/restore_db.sh FILENAME
 +
 +where FILENAME is the backup filename (can be .sql or .sql.gz)
 +
 +To backup the database, just run in another terminal::
 +
 +    docker-compose run db /srv/backup/backup_db.sh
 +
 +
  API / Documentation
  ====================