Signed-off-by: Julien Loève (home) <julien.loeve@imerir.com>
Merge branch 'master' of git@github.com:JSabbatier/Eevee.git

Conflicts:
	application server/ApplicationServer/ApplicationServer.v12.suo