Signed-off-by: stef <sofiene.aissaoui@gmail.com>
Merge branch 'master' into dev

Conflicts:
	server/src/main/webapp/client/add.html
	server/src/main/webapp/js/add_client.js

Signed-off-by: stef <sofiene.aissaoui@gmail.com>


Signed-off-by: stef <sofiene.aissaoui@gmail.com>


Signed-off-by: stef <sofiene.aissaoui@gmail.com>