Merge branch 'master' of https://github.com/Factor-X/awac
Added entities and services related to data consolidation (indicators, activity data, etc.)