Merge branch 'master' of /home/skycom/Workspace/analytics with conflicts.
AG: expose track method so tracking can be manually fired