Merge branch 'subtree'

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

diff --cc src/be/nikiroo/fanfix/bundles/resources_gui.properties
Simple merge

diff --cc src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties
Simple merge

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

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