init auryane
Merge origin/master into develop

Conflicts:
	genindexe/nbproject/build-impl.xml
	genindexe/nbproject/genfiles.properties