Merge branch 'subtree'

diff --cc src/be/nikiroo/utils/ui/ConfigItem.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ConfigItemBoolean.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ConfigItemBrowse.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ConfigItemColor.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ConfigItemCombobox.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ConfigItemInteger.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ConfigItemPassword.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ConfigItemString.java
Simple merge