More flexible implementation of multiAggregate
Merge branch 'development' of https://github.com/adlnet/xAPI-Dashboard into development