Client and Group timeline Implementation
Merge pull request #666 from Musoni/MIFOSX-765

MIFOSX-765 - Client and Group timeline Implementation