Merge commit '9a553563269f93bae59cf45e43933c81fdec07e8'

diff --cc src/be/nikiroo/fanfix/Main.java
Simple merge

diff --cc src/be/nikiroo/fanfix/VersionCheck.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/RemoteLibrary.java
Simple merge

diff --cc src/be/nikiroo/fanfix/test/BasicSupportDeprecatedTest.java
index 0000000000000000000000000000000000000000,c8c4b401727e7927af3ccca210ed158e4902c97b..c8c4b401727e7927af3ccca210ed158e4902c97b
mode 000000,100644..100644
--- /dev/null
--- 2/test/BasicSupportDeprecatedTest.java
+++ b/src/be/nikiroo/fanfix/test/BasicSupportDeprecatedTest.java

diff --cc src/be/nikiroo/fanfix/test/BasicSupportUtilitiesTest.java
index 0000000000000000000000000000000000000000,9cec2208c28a03a189adc10b31b4a97ac0b4b722..9cec2208c28a03a189adc10b31b4a97ac0b4b722
mode 000000,100644..100644
--- /dev/null
--- 2/test/BasicSupportUtilitiesTest.java
+++ b/src/be/nikiroo/fanfix/test/BasicSupportUtilitiesTest.java

diff --cc src/be/nikiroo/fanfix/test/ConversionTest.java
index 0000000000000000000000000000000000000000,2b22364dca5241049420bd05bc09c740e48841c5..2b22364dca5241049420bd05bc09c740e48841c5
mode 000000,100644..100644
--- /dev/null
--- 2/test/ConversionTest.java
+++ b/src/be/nikiroo/fanfix/test/ConversionTest.java

diff --cc src/be/nikiroo/fanfix/test/LibraryTest.java
index 0000000000000000000000000000000000000000,da44438d02027f0b30f219d428bd1c466d21ea54..da44438d02027f0b30f219d428bd1c466d21ea54
mode 000000,100644..100644
--- /dev/null
--- 2/test/LibraryTest.java
+++ b/src/be/nikiroo/fanfix/test/LibraryTest.java

diff --cc src/be/nikiroo/fanfix/test/Test.java
index 0000000000000000000000000000000000000000,5ec24a43b1b6a0eee8ba68991c9b2fe9d86c2c7b..5ec24a43b1b6a0eee8ba68991c9b2fe9d86c2c7b
mode 000000,100644..100644
--- /dev/null
--- 2/test/Test.java
+++ b/src/be/nikiroo/fanfix/test/Test.java

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/cbz.cbz
index 0000000000000000000000000000000000000000,28cc25b18b0a9b5733d99b8b3645e648ffcf8b4e..28cc25b18b0a9b5733d99b8b3645e648ffcf8b4e
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/epub.epub
index 0000000000000000000000000000000000000000,776d05decef0244c9bf3b6a2c99110e1b51f18b6..776d05decef0244c9bf3b6a2c99110e1b51f18b6
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/html.info
index 0000000000000000000000000000000000000000,506e477fd8a4a13cf144ec3d1fcf0f991f8ab35b..506e477fd8a4a13cf144ec3d1fcf0f991f8ab35b
mode 000000,100644..100644
--- /dev/null
--- 2/test/expected_test.story/html/html.info
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/html.info

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/html.txt
index 0000000000000000000000000000000000000000,a3a3af31bed24a381b647911935ef687642b541a..a3a3af31bed24a381b647911935ef687642b541a
mode 000000,100644..100644
--- /dev/null
--- 2/test/expected_test.story/html/html.txt
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/html.txt

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/index.html
index 0000000000000000000000000000000000000000,aade9c3fadd6e163d648198369f40a5d547416f1..aade9c3fadd6e163d648198369f40a5d547416f1
mode 000000,100644..100644
--- /dev/null
--- 2/test/expected_test.story/html/index.html
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/index.html

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/style.css
index 0000000000000000000000000000000000000000,6b6d0d20226c932d7f621ed8324d6f07884c45a9..6b6d0d20226c932d7f621ed8324d6f07884c45a9
mode 000000,100644..100644
--- /dev/null
--- 2/output/html.style.css
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/style.css

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/info_text
index 0000000000000000000000000000000000000000,768b3ccbc7af8fb8f6902ab0e366d01344433255..768b3ccbc7af8fb8f6902ab0e366d01344433255
mode 000000,100644..100644
--- /dev/null
--- 2/test/expected_test.story/info_text
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/info_text

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/info_text.info
index 0000000000000000000000000000000000000000,cc522dd3bbff15f0fcfc5203eb782e461d4f9d33..cc522dd3bbff15f0fcfc5203eb782e461d4f9d33
mode 000000,100644..100644
--- /dev/null
--- 2/test/expected_test.story/info_text.info
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/info_text.info

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/latex.tex
index 0000000000000000000000000000000000000000,d4dd68f109e31a7e66c7a8f0ec8370e0a1d73d44..d4dd68f109e31a7e66c7a8f0ec8370e0a1d73d44
mode 000000,100644..100644
--- /dev/null
--- 2/test/expected_test.story/latex.tex
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/latex.tex

diff --cc src/be/nikiroo/fanfix/test/expected_test.story/text.txt
index 0000000000000000000000000000000000000000,a3a3af31bed24a381b647911935ef687642b541a..a3a3af31bed24a381b647911935ef687642b541a
mode 000000,100644..100644
--- /dev/null
--- 2/test/expected_test.story/html/html.txt
+++ b/src/be/nikiroo/fanfix/test/expected_test.story/text.txt

diff --cc src/be/nikiroo/fanfix/test/test.story
index 0000000000000000000000000000000000000000,7365b6077b1320ba6094539fff73e606f8e867ad..7365b6077b1320ba6094539fff73e606f8e867ad
mode 000000,100644..100644
--- /dev/null
--- 2/test/test.story
+++ b/src/be/nikiroo/fanfix/test/test.story