Merge commit '4536c5cf2d7b8e68768f90d281b3e4974cd26ae9'

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

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

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

diff --cc src/be/nikiroo/fanfix/library/LocalLibrary.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
Simple merge

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