Move aggregation into a dedicated function
Merge branch 'YeastLab-traceManager' of https://github.com/appsgate2015/appsgate into YeastLab-traceManager
Fix bug when loading traces with live trace on