Merge branch 'develop' into Leander's-develop

Conflicts:
	src/husacct/define/domain/SoftwareArchitecture.java
	src/husacct/define/domain/module/Module.java
	src/husacct/define/domain/services/DefaultRuleDomainService.java
Merge fixed
Merge branch 'develop' into Leander's-develop

Conflicts:
	src/husacct/define/persistency/PersistentDomain.java
Merge branch 'develop' into local

Conflicts:
	src/husacct/control/task/AnalyseTask.java
	src/husacct/define/persistency/PersistentDomain.java
(Define) Added Right-Click Menu in Modules
Error message for component with duplicate name
Merge branch 'develop' of https://github.com/senkz/HUSACCT into develop

Conflicts:
	src/husacct/define/presentation/jpanel/ModuleJPanel.java
Merge branch 'Leander's-develop' into develop

Conflicts:
	src/husacct/define/domain/SoftwareArchitecture.java
	src/husacct/define/domain/module/Module.java
	src/husacct/define/domain/services/DefaultRuleDomainService.java
	src/husacct/define/persistency/PersistentDomain.java
Merge branch 'reuben-develop' into develop

Conflicts:
	src/husacct/control/task/AnalyseTask.java
	src/husacct/define/domain/SoftwareArchitecture.java
	src/husacct/define/domain/module/Module.java
	src/husacct/define/domain/services/DefaultRuleDomainService.java
	src/husacct/define/persistency/PersistentDomain.java