Merge branch 'master' into subtree

diff --cc DataLoader.java
Simple merge

diff --cc Instance.java
Simple merge

diff --cc Main.java
Simple merge

diff --cc VersionCheck.java
Simple merge

diff --cc bundles/resources_core.properties
Simple merge

diff --cc bundles/resources_core_fr.properties
Simple merge

diff --cc library/BasicLibrary.java
Simple merge

diff --cc library/CacheLibrary.java
Simple merge

diff --cc library/LocalLibrary.java
Simple merge

diff --cc library/MetaResultList.java
index 0000000000000000000000000000000000000000,886defe8b1c6a9df42639f04c82ebd87d5396bbd..886defe8b1c6a9df42639f04c82ebd87d5396bbd
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/MetaResultList.java
+++ b/library/MetaResultList.java

diff --cc library/RemoteLibrary.java
Simple merge

diff --cc library/RemoteLibraryServer.java
Simple merge

diff --cc output/BasicOutput.java
Simple merge

diff --cc output/Cbz.java
Simple merge

diff --cc output/Epub.java
Simple merge

diff --cc output/Html.java
Simple merge

diff --cc output/InfoCover.java
Simple merge

diff --cc output/InfoText.java
Simple merge

diff --cc output/LaTeX.java
Simple merge

diff --cc output/Text.java
Simple merge

diff --cc reader/BasicReader.java
Simple merge

diff --cc searchable/BasicSearchable.java
Simple merge

diff --cc searchable/Fanfiction.java
Simple merge

diff --cc searchable/MangaLel.java
Simple merge

diff --cc supported/BasicSupport.java
Simple merge

diff --cc supported/BasicSupportHelper.java
Simple merge

diff --cc supported/BasicSupportImages.java
Simple merge

diff --cc supported/BasicSupportPara.java
Simple merge

diff --cc supported/BasicSupport_Deprecated.java
Simple merge

diff --cc supported/Cbz.java
Simple merge

diff --cc supported/E621.java
Simple merge

diff --cc supported/EHentai.java
Simple merge

diff --cc supported/Epub.java
Simple merge

diff --cc supported/Fanfiction.java
Simple merge

diff --cc supported/Fimfiction.java
Simple merge

diff --cc supported/FimfictionApi.java
Simple merge

diff --cc supported/Html.java
Simple merge

diff --cc supported/InfoReader.java
Simple merge

diff --cc supported/MangaHub.java
index 0000000000000000000000000000000000000000,706a59114adf62949044cf1eb52b8347d38749dc..706a59114adf62949044cf1eb52b8347d38749dc
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/supported/MangaHub.java
+++ b/supported/MangaHub.java

diff --cc supported/MangaLel.java
Simple merge

diff --cc supported/SupportType.java
Simple merge

diff --cc supported/Text.java
Simple merge

diff --cc supported/YiffStar.java
Simple merge

diff --cc test/BasicSupportDeprecatedTest.java
Simple merge

diff --cc test/BasicSupportUtilitiesTest.java
Simple merge

diff --cc test/ConversionTest.java
Simple merge

diff --cc test/LibraryTest.java
Simple merge

diff --cc test/Test.java
Simple merge