Merge branch 'master' into 2.1

diff --cc .travis.yml
index 0e72d207230207a7048f2adbf05d732b5d439a22,7fe15c5f7b64a3f1b269cefdf8996a5561b05be2..17c3abafc6fc325458438c4434c010dcc0e1a705
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -65,8 -53,8 +65,8 @@@ before_install
      - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
  
  script:
 -    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
 +    - travis_wait bash install.sh
      - ant prepare-$DB
-     - bin/phpunit -v
+     - phpunit -v
      - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
      - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;

diff --cc app/config/config.yml
Simple merge

diff --cc app/config/config_dev.yml
Simple merge

diff --cc composer.json
Simple merge

diff --cc tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
Simple merge