Dev-->Master - Release 2.4.0

This is the Andlytics v2.4.0 code base