testxavier

test
Merge branch 'master' of https://github.com/eddyEMA/CarnetDeNotes

Conflicts:
	CarnetDeNotes/nbproject/build-impl.xml
	CarnetDeNotes/nbproject/genfiles.properties
	CarnetDeNotes/nbproject/private/private.properties
	CarnetDeNotes/nbproject/private/private.xml
	CarnetDeNotes/nbproject/project.properties
	CarnetDeNotes/nbproject/project.xml