searchAnalysis(Types_analysis type)
Merge branch 'develop' of https://github.com/Jereem/SCRUM into develop
searchAnalysis(Types_analysis type)
Merge branch 'develop' of https://github.com/Jereem/SCRUM into develop

Conflicts:
	genindexe/src/ManagedBeans/Database.java
Merge branch 'develop' of https://github.com/Jereem/SCRUM into develop

Conflicts:
	genindexe/src/ManagedBeans/Database.java