Updated to separated web and aggregator
Resolve conflicts
Merge remote-tracking branch 'origin/master'
Fix
Updated
Merge branch 'separated-aggregator'