[JohnnyEnglish][Google Analytics] Adding time tracking support, google analytics tracker
[Conflict] fixing conflicts