Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/husacct/analyse/AnalyseServiceImpl.java
	src/husacct/analyse/AnalyseServiceStub.java
	src/husacct/analyse/IAnalyseService.java
	src/husacct/analyse/domain/IModelQueryService.java
	src/husacct/analyse/domain/famix/FamixQueryServiceImpl.java
Merge branch 'develop' of https://Kcirson@github.com/twanwv/HUSACCT.git
into develop