Merge pull request #62 from LearningLocker/master

Merge latest hotfix
Fixed ticket #56
A temp fix to handle contextActivities grouping being in array
Merge pull request #70 from LearningLocker/develop

Develop latest