Merge commit '87ffaa787388b0389f5134aa70c4b1e2e940c118'

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

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

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

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

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

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

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

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