Merge branch 'master' into license-warning

Author: widatama

plugins/push/frontend/public/javascripts/countly.views.js

@@ -1122,6 +1122,10 @@
                 this.setIsLoading(true);
                 countlyPushNotification.service.fetchById(this.id)
                     .then(function(response) {
+                        //Set default settings
+                        response.isEe = (typeof countlySegmentation !== 'undefined');
+                        response.isGeo = (typeof countlyLocationTargetComponent !== 'undefined');
+                        response.isCohorts = (typeof countlyCohorts !== 'undefined');
                         self.setPushNotificationUnderEdit(response);
                         if (self.userCommand === self.UserCommandEnum.DUPLICATE) {
                             self.setId(null);