Removed ability to add ActivitySource & AcitivityType
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	app/eu/factorx/awac/service/knowledge/activity/contributor/household/BaseActivityDataAM_BAD14C.java