Merge remote-tracking branch 'origin/master' into 2.1

diff --cc .gitignore
Simple merge

diff --cc .travis.yml
index 17c3abafc6fc325458438c4434c010dcc0e1a705,1a33198a283ada9edf0a7c446f788eaa6dfc6bef..dd8815c13cd2808f579e3149db9532c66cb67119
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -23,15 -20,13 +23,16 @@@ php
      - 5.5
      - 5.6
      - 7.0
+     - nightly
      - hhvm
  
 +node_js:
 +    - "5"
 +
  env:
 -    - DB=mysql
 -    - DB=pgsql
 -    - DB=sqlite
 +    - DB=mysql ASSETS=nobuild
 +    - DB=pgsql ASSETS=nobuild
 +    - DB=sqlite ASSETS=nobuild
  
  matrix:
      fast_finish: true

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 src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
Simple merge