again
Merge branch 'master' of https://github.com/nmaillat/test-nic

Conflicts:
	add_by_web_interface.txt