Merge serveur (marche pas !!!! (encore))

Change-Id: I218a54c050f29ad44abeed00e88a59949dc35062
Merge remote-tracking branch 'original/master'

Conflicts:
	client/controller/front.php
	client/controller/login.php
	client/includes/sessioncheck.php
	server/public/ws.php

Change-Id: I30a8b57295d27b39c0f4679273032503323ce425