Sync to get the last update from the repo

Signed-off-by: Julien Loeve <julien.loeve@imerir.com>
Merge branch 'master' of git@github.com:JSabbatier/Eevee.git

Conflicts:
	application server/ApplicationServer/ApplicationServer.sdf
	application server/ApplicationServer/ApplicationServer.v12.suo
Signed-off-by: Julien Loeve <julien.loeve@imerir.com>
Merge branch 'master' of git@github.com:JSabbatier/Eevee.git
Receiving and responding to the supervison with hard encoded json

Signed-off-by: Julien Loeve <julien.loeve@imerir.com>