Malo

Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	_xmsgs/pn_parser.xmsgs
	iseconfig/nanoControleur.xreport
	nanoControleur_summary.html
Test

test