Merge conflict
Merge branch 'master' of https://twanwv@github.com/twanwv/HUSACCT.git

Conflicts:
	src/husacct/analyse/IAnalyseService.java

fixed merge problem - Twan