Merge branch 'dev' into continuous_deployment

Author: matthias_schaub

.travis.yml

@@ -36,7 +36,7 @@ script:
   - docker-compose up --build --detach firebase_deploy
   - docker-compose up --build --detach postgres
   - docker-compose run mapswipe_workers python -m unittest discover --verbose --start-directory tests/unittests/
-  # TODO: - docker-compose run mapswipe_workers python -m unittest discover --verbose --start-directory tests/integration/
+  - docker-compose run mapswipe_workers python -m unittest discover --verbose --start-directory tests/integration/
 
 after_success:
   # Deploy to development server using Ansible