Merge pull request #4 from HUSACCT/develop

Merge C2 week 1
Merge pull request #5 from HUSACCT/develop

C2 Merge 1
This will allow us to save the softwareunits as per request by team 1
I'm not entirely sure how to do this with dependancies so this will need
a follow up
Merge conflict resolved
Merge conflict resolving #2
Merge branch 'develop' of https://github.com/twanwv/HUSACCT.git 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 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
All merge problems are resolved now!
Bug fixes regarding the external system DTO.
Changed the location where the external systems are defined to a more
proper place.
Merge pull request #6 from HUSACCT/develop

Construction 2 merge 2
merging master to develop
Merge branch 'master' into develop
Just a step to prevent the multithreading to break our test
HistoryLogger as per request by team 1
Enable the HistoryLogger to save after analyse process is finished
Correct use of a and an
5 Direct dependencies added.
Dependencies Translated to Dutch.
Merge branch 'develop' of https://AlexPwn@github.com/twanwv/HUSACCT.git
into develop

Conflicts:
	src/husacct/common/resources/locale/husacct_en.properties
Reverted back the changes Rick  made but were overwritten by Alex