Fix for the activity count indexer issue
Merge branch 'master' of https://github.com/CCI-MIT/XCoLab
merge fix