refactor old code
Merge branch 'Leander's-develop' into reuben-develop

Conflicts:
	src/husacct/define/domain/services/DefaultRuleDomainService.java