Merge branch 'subtree'

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

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

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

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

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

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