Merge commit 'b459e462a5c3447d0693674253c40bc7385a4f66'

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

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

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

diff --cc src/be/nikiroo/fanfix/library/web/clear-32x32.png
index 0000000000000000000000000000000000000000,bdc51d0ce3e791a8e183e646e35b7f8f6a297996..bdc51d0ce3e791a8e183e646e35b7f8f6a297996
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/fanfix/library/web/clear.png
index 0000000000000000000000000000000000000000,db0509fc1834f85d2284a49b1a7c37840007f412..db0509fc1834f85d2284a49b1a7c37840007f412
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/fanfix/library/web/style.css
Simple merge