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

Conflicts:
	CarnetDeNotes/nbproject/private/private.properties
	CarnetDeNotes/nbproject/private/private.xml