Export XML fonctionnel
Merge branch 'master' of https://github.com/nemaid/nemaid31

Conflicts:
	save.php
Merge branch 'master' of https://github.com/nemaid/nemaid31
Merge branch 'master' of https://github.com/nemaid/nemaid31