Merge branch 'subtree'

diff --cc src/be/nikiroo/utils/CookieUtils.java
index 0000000000000000000000000000000000000000,f0820260ffd7365facd6ebedf61d7069efd46bae..f0820260ffd7365facd6ebedf61d7069efd46bae
mode 000000,100644..100644
--- /dev/null
--- 2/CookieUtils.java
+++ b/src/be/nikiroo/utils/CookieUtils.java

diff --cc src/be/nikiroo/utils/HashUtils.java
index 0000000000000000000000000000000000000000,df8d7c62daee97649c3e7528a6b884b3e041fd6e..df8d7c62daee97649c3e7528a6b884b3e041fd6e
mode 000000,100644..100644
--- /dev/null
--- 2/HashUtils.java
+++ b/src/be/nikiroo/utils/HashUtils.java

diff --cc src/be/nikiroo/utils/NanoHTTPD.java
index 0000000000000000000000000000000000000000,8d183c1c4061d255af4c24041b46d0a59cfd1fe9..8d183c1c4061d255af4c24041b46d0a59cfd1fe9
mode 000000,100644..100644
--- /dev/null
--- 2/NanoHTTPD.java
+++ b/src/be/nikiroo/utils/NanoHTTPD.java

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