Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

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

diff --cc classes/xorgsession.php
Simple merge

diff --cc core
index 35fff9b,adc69ce..fed2b6d
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 35fff9b04585817e74f4709f36b70d959ce3224c
 -Subproject commit adc69ced9c75421c5ee596fbd0a3426fffb9940c
++Subproject commit fed2b6d36f59c4542bd8d6fc0a137342c785d06b

diff --cc modules/register.php
Simple merge