Merge branch 'dev' into release/1.7

Conflicts:
	Dockerfile

diff --cc Dockerfile
index 46cd53b26fc821de2791e21be249105185a333da,5480650d34316e43ef531a33669de92fdadf08a8..a64c0ba0c5ffff64f38491d0ae425e985599c2d0
--- 1/Dockerfile
--- 2/Dockerfile
+++ b/Dockerfile
@@@ -37,5 -35,9 +33,10 @@@ COPY ./app/scripts/setup_plugins.sh /sr
  COPY ./lib/ /srv/src/plugins/
  RUN /bin/bash /srv/app/scripts/setup_plugins.sh
  
+ # Install Telemeta
+ RUN pip install -r requirements.txt
+ RUN pip install -r requirements-dev.txt --src /srv/src
++RUN pip uninstall -y South
+ 
  WORKDIR /srv/app
  EXPOSE 8000