Merge origin/develop into develop

Conflicts:
	genindexe/src/ManagedBeans/Database.java
Merge origin/develop into develop