Merge branch 'master' into subtree

diff --cc Instance.java
Simple merge

diff --cc Main.java
Simple merge

diff --cc bundles/Config.java
Simple merge

diff --cc data/JsonIO.java
index 0000000000000000000000000000000000000000,db81db65a03b93555445a7ac4254b19707aa9c1f..db81db65a03b93555445a7ac4254b19707aa9c1f
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/data/JsonIO.java
+++ b/data/JsonIO.java

diff --cc library/MetaResultList.java
Simple merge

diff --cc library/RemoteLibrary.java
Simple merge

diff --cc library/RemoteLibraryServer.java
Simple merge

diff --cc library/WebLibrary.java
index 0000000000000000000000000000000000000000,369eb23491cd6410cf45027f95a8a0612ee324d5..369eb23491cd6410cf45027f95a8a0612ee324d5
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/WebLibrary.java
+++ b/library/WebLibrary.java

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

diff --cc library/web/WebLibraryServerIndex.java
index 0000000000000000000000000000000000000000,15c371baebf02a6083006eeb7a5652eeb542c6ca..15c371baebf02a6083006eeb7a5652eeb542c6ca
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/web/WebLibraryServerIndex.java
+++ b/library/web/WebLibraryServerIndex.java

diff --cc library/web/actual_size-32x32.png
index 0000000000000000000000000000000000000000,0d356b7b7adeab775a667ebbb7d67bfe5557e92a..0d356b7b7adeab775a667ebbb7d67bfe5557e92a
mode 000000,100644..100644
Binary files differ

diff --cc library/web/actual_size-64x64.png
index 0000000000000000000000000000000000000000,474afdabb13d6118a27d69d96bd8e3fb899527e1..474afdabb13d6118a27d69d96bd8e3fb899527e1
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_double_left-32x32.png
index 0000000000000000000000000000000000000000,e163b601b3d6324af3b558dd3b4bf21f2cb01b87..e163b601b3d6324af3b558dd3b4bf21f2cb01b87
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_double_left-64x64.png
index 0000000000000000000000000000000000000000,e66dd9352311d36b3af190a70235ed7db4607f1b..e66dd9352311d36b3af190a70235ed7db4607f1b
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_double_right-32x32.png
index 0000000000000000000000000000000000000000,297dcab550c28b1826732224fd608fda1cdf6821..297dcab550c28b1826732224fd608fda1cdf6821
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_double_right-64x64.png
index 0000000000000000000000000000000000000000,52226f634bc53c1eb416a7a6e33ffbb27d76e2a1..52226f634bc53c1eb416a7a6e33ffbb27d76e2a1
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_left-32x32.png
index 0000000000000000000000000000000000000000,af83425c1d433fe039dd68e8ccae3a8ec330f550..af83425c1d433fe039dd68e8ccae3a8ec330f550
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_left-64x64.png
index 0000000000000000000000000000000000000000,44cba9cb765467c06ad81f4dfe7b44232773a6a5..44cba9cb765467c06ad81f4dfe7b44232773a6a5
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_right-32x32.png
index 0000000000000000000000000000000000000000,2540b62490576537958918a513d782a8289a40a6..2540b62490576537958918a513d782a8289a40a6
mode 000000,100644..100644
Binary files differ

diff --cc library/web/arrow_right-64x64.png
index 0000000000000000000000000000000000000000,ab960b3e2273de447078ae6ca626902d487a858c..ab960b3e2273de447078ae6ca626902d487a858c
mode 000000,100644..100644
Binary files differ

diff --cc library/web/avicon.ico
index 0000000000000000000000000000000000000000,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/web/avicon.ico
+++ b/library/web/avicon.ico

diff --cc library/web/back-32x32.png
index 0000000000000000000000000000000000000000,46c19dc93743cfe25cad61f066896cbc02fa9dc0..46c19dc93743cfe25cad61f066896cbc02fa9dc0
mode 000000,100644..100644
Binary files differ

diff --cc library/web/back-64x64.png
index 0000000000000000000000000000000000000000,d58d004c38cf4393d9ac8ef649ba713805de146e..d58d004c38cf4393d9ac8ef649ba713805de146e
mode 000000,100644..100644
Binary files differ

diff --cc library/web/favicon.ico
index 0000000000000000000000000000000000000000,feedaf08e6ca1e10810b455ce4b248f8bf305eff..feedaf08e6ca1e10810b455ce4b248f8bf305eff
mode 000000,100644..100644
Binary files differ

diff --cc library/web/fit_to_height-32x32.png
index 0000000000000000000000000000000000000000,727dec2dcb4c1b2b044a70c48dffa88d29eca5cf..727dec2dcb4c1b2b044a70c48dffa88d29eca5cf
mode 000000,100644..100644
Binary files differ

diff --cc library/web/fit_to_height-64x64.png
index 0000000000000000000000000000000000000000,cec7da458a3bd365e61a479acf31820e8ac8ec77..cec7da458a3bd365e61a479acf31820e8ac8ec77
mode 000000,100644..100644
Binary files differ

diff --cc library/web/fit_to_width-32x32.png
index 0000000000000000000000000000000000000000,ee90843fbbc17913042df3ea4a59f3108ec1d625..ee90843fbbc17913042df3ea4a59f3108ec1d625
mode 000000,100644..100644
Binary files differ

diff --cc library/web/fit_to_width-64x64.png
index 0000000000000000000000000000000000000000,7b897d26a9f09f975ea89c19c2e49d18fe36e185..7b897d26a9f09f975ea89c19c2e49d18fe36e185
mode 000000,100644..100644
Binary files differ

diff --cc library/web/icon_alternative.png
index 0000000000000000000000000000000000000000,4ab09577c830432ed67218d976e31d8b3d88ebfa..4ab09577c830432ed67218d976e31d8b3d88ebfa
mode 000000,100644..100644
Binary files differ

diff --cc library/web/icon_default.png
index 0000000000000000000000000000000000000000,983b34400ddea4e205b9c6919cd90ab605f1ff68..983b34400ddea4e205b9c6919cd90ab605f1ff68
mode 000000,100644..100644
Binary files differ

diff --cc library/web/icon_magic_book.png
index 0000000000000000000000000000000000000000,1798dd3230ebe9842ec48caf37d5492aa48f157d..1798dd3230ebe9842ec48caf37d5492aa48f157d
mode 000000,100644..100644
Binary files differ

diff --cc library/web/icon_pony_book.png
index 0000000000000000000000000000000000000000,fb6fe0d381b6950d9418e63b001bbad8dbba908d..fb6fe0d381b6950d9418e63b001bbad8dbba908d
mode 000000,100644..100644
Binary files differ

diff --cc library/web/icon_pony_library.png
index 0000000000000000000000000000000000000000,a56a4d29312a2b1dfda9f406b85ef8e3face7d8f..a56a4d29312a2b1dfda9f406b85ef8e3face7d8f
mode 000000,100644..100644
Binary files differ

diff --cc library/web/index.post.html
index 0000000000000000000000000000000000000000,d4e09056cfb7b69cac7f357bc8db22e83e0f3450..d4e09056cfb7b69cac7f357bc8db22e83e0f3450
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/web/index.post.html
+++ b/library/web/index.post.html

diff --cc library/web/index.pre.html
index 0000000000000000000000000000000000000000,18c1508b33c037b305024d392540e7644875ef30..18c1508b33c037b305024d392540e7644875ef30
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/web/index.pre.html
+++ b/library/web/index.pre.html

diff --cc library/web/search-32x32.png
index 0000000000000000000000000000000000000000,92b716d7d54af7190e68d1261b0842127d4c5c41..92b716d7d54af7190e68d1261b0842127d4c5c41
mode 000000,100644..100644
Binary files differ

diff --cc library/web/search-64x64.png
index 0000000000000000000000000000000000000000,93dbf6d9682c491ca961b35ec9aafa65e688fc2d..93dbf6d9682c491ca961b35ec9aafa65e688fc2d
mode 000000,100644..100644
Binary files differ

diff --cc library/web/style.css
index 0000000000000000000000000000000000000000,c520d78f2230fc2a8dad5e95f13f768f87f540d6..c520d78f2230fc2a8dad5e95f13f768f87f540d6
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/web/style.css
+++ b/library/web/style.css

diff --cc library/web/unknown-32x32.png
index 0000000000000000000000000000000000000000,d2315d1dce4c75e63bd43c801ec03641ae53b3ba..d2315d1dce4c75e63bd43c801ec03641ae53b3ba
mode 000000,100644..100644
Binary files differ

diff --cc library/web/unknown-64x64.png
index 0000000000000000000000000000000000000000,261889d71a53636e96bfcc8ea38a2bb6f3036ed1..261889d71a53636e96bfcc8ea38a2bb6f3036ed1
mode 000000,100644..100644
Binary files differ

diff --cc reader/TextOutput.java
index 0000000000000000000000000000000000000000,60b3a7f7c1db5d5ae40b3ebe4e5cde9754817869..60b3a7f7c1db5d5ae40b3ebe4e5cde9754817869
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/reader/TextOutput.java
+++ b/reader/TextOutput.java