Merge origin/develop into develop

Conflicts:
	genindexe/nbproject/project.properties
Merge origin/develop into develop