Several updates
Merge branch 'develop' of https://github.com/mkaziz/ChatterTrack into develop