Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc core
index 9ca0abd,a12a0ce..d7dfb18
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 9ca0abdd001bbf5dcda5aaa66b7b2b2073c865b9
 -Subproject commit a12a0ce3c524c4edabcbb0e872fbc84fc3bad498
++Subproject commit d7dfb18e275c1ed834ea8f0f4001399b0a17ce9f

diff --cc include/geoloc.inc.php
Simple merge