wip results
wip results
Merge branch 'wip/reporting_reeng' of https://github.com/Factor-X/awac into wip/reporting_reeng
Fixed merge error
wip results
Merge remote-tracking branch 'origin/master' into wip/reporting_reeng

Conflicts:
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD1.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD10A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD10B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD10C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD10E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD10F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD10G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD11H.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12H.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12I.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12J.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12K.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12L.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12M.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD12N.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD13H.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD14.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD15A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD15B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD15C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD16A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD16B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD16C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD16D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD16E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17H.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD17I.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD18A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD18B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD18C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD18D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD18E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD18F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD19A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD19B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD19C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD20.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD21.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD22.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD23.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD24.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD25.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD26A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD26B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27H.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27I.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27J.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27K.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD27L.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD28.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD29A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD29B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD29C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD2A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD2B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD3.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD30.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31H.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD31I.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD32A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD32B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD32C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD32D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD32E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD32F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD33A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD33B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD33C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD34A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD34B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD34C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD35A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD35B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD35C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD35D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD36.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD37A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD37B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD37C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD38A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD38B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD38C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD39A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD39B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD4.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD40.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD5.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD6A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD6B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD7A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD7B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD7C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD8A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD8B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD8C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD9A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD9B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/enterprise/BaseActivityDataAE_BAD9C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD1.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD10A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD10B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD11A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD11B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD11C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD11D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD12A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD12B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD12C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD12D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD12E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD12F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD12G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD13.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14H.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14I.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14J.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14K.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD14L.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD15A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD15B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD15C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD16A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD16B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD2A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD2B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD3.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD4.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD5A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD5B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD5C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD5D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD5E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD5F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD6A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD6B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD7A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD7B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD8A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD8B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9A.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9B.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9C.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9D.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9E.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9F.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9G.java
	app/eu/factorx/awac/service/knowledge/activity/contributor/municipality/BaseActivityDataAC_BAD9H.java
wip results
wip results