Merge branch 'master' into subtree

diff --cc data/MetaData.java
Simple merge

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

diff --cc library/WebLibraryServerHtml.java
Simple merge

diff --cc library/web/style.css
Simple merge

diff --cc library/web/templates/WebLibraryServerTemplates.java
Simple merge

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

diff --cc library/web/templates/login.html
index 0000000000000000000000000000000000000000,001914429438df696f33b79337229c7c0ef5ff2a..001914429438df696f33b79337229c7c0ef5ff2a
mode 000000,100644..100644
--- /dev/null
--- 2/src/be/nikiroo/fanfix/library/web/templates/login.html
+++ b/library/web/templates/login.html

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

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

diff --cc supported/BasicSupport.java
Simple merge

diff --cc supported/BasicSupport_Deprecated.java
Simple merge

diff --cc supported/E621.java
Simple merge

diff --cc supported/EHentai.java
Simple merge

diff --cc supported/Fanfiction.java
Simple merge

diff --cc supported/Fimfiction.java
Simple merge

diff --cc supported/FimfictionApi.java
Simple merge

diff --cc supported/MangaHub.java
Simple merge

diff --cc supported/MangaLel.java
Simple merge

diff --cc supported/Text.java
Simple merge

diff --cc supported/YiffStar.java
Simple merge