Merge branch 'master' into next

Author: ar2rsawseen

frontend/express/public/javascripts/countly/countly.common.js

@@ -2243,7 +2243,8 @@
 
                     for (i = 0; i < allWeeks.length; i++) {
                         var parts = allWeeks[i].split(" ");
-                        if (parseInt(parts[1]) === moment().isoWeekYear(parseInt(parts[1])).isoWeek(parseInt(parts[0])).isoWeekday(1).year()) {
+                        //iso week falls in the year which has thursday of the week
+                        if (parseInt(parts[1]) === moment().isoWeekYear(parseInt(parts[1])).isoWeek(parseInt(parts[0])).isoWeekday(4).year()) {
                             ticks.push([i, "W" + allWeeks[i]]);
 
                             var weekText = countlyCommon.formatDate(moment().isoWeekYear(parseInt(parts[1])).isoWeek(parseInt(parts[0])).isoWeekday(1), ", D MMM YYYY");