Merge branch 'master' into dev

Conflicts:
	index.php

diff --combined CREDITS.md
index f1e9d7af4a13c1dd8aa1671ee1931fb4a7fb6951,ffef5b33f92d074344b2d20dc66b96a235a9cd4f..e76c580d38bd8060fdef8fd55a0e186617f4deb4
--- 1/CREDITS.md
--- 2/CREDITS.md
+++ b/CREDITS.md
@@@ -1,6 -1,7 +1,6 @@@
  wallabag is based on :
  * PHP Readability https://bitbucket.org/fivefilters/php-readability
  * Full Text RSS http://code.fivefilters.org/full-text-rss/src
 -* Encoding https://github.com/neitanod/forceutf8
  * logo by Maylis Agniel https://github.com/wallabag/logo
  * icons http://icomoon.io
  * PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
@@@ -8,9 -9,8 +8,10 @@@
  * Twig http://twig.sensiolabs.org
  * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
  * Pagination https://github.com/daveismyname/pagination
+ * PHPePub https://github.com/Grandt/PHPePub/
  
 -wallabag is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
 +wallabag is mainly developed by Nicolas Lœuillet under the MIT License
 +
 +Thank you so much to @tcitworld and @mariroz.
  
- Contributors : https://github.com/wallabag/wallabag/graphs/contributors
+ Contributors : https://github.com/wallabag/wallabag/graphs/contributors