Merge branch 'master' of https://github.com/fsamin/nora.js

Conflicts:
	nora.js
Ajout generation Xreport