me rappelle plus
Merge branch 'gestion_ndd'

Conflicts:
	admin/index.html
	admin/js/app.js
	admin/js/keylist.js
	server/library/Exaprint/Translate/KeysSelection.php
	server/library/Exaprint/Translate/Server.php
	server/public/index.php