Merge commit '6d465e886ae46c9da99117cc4302948f700a51c4'

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

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