indicator test
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/eu/factorx/awac/service/IndicatorServiceTest.java
correct OrganizationTest