Merge fixes

Author: ar2rsawseen

api/parts/mgmt/apps.js

@@ -11,6 +11,7 @@ var appsApi = {},
     crypto = require('crypto'),
     plugins = require('../../../plugins/pluginManager.js'),
     jimp = require('jimp'),
+    fs = require('fs'),
     countlyFs = require('./../../utils/countlyFs.js');
 
 /**

frontend/express/app.js

@@ -1553,7 +1553,7 @@ app.post(countlyConfig.path + '/user/settings', function(req, res, next) {
             if (err || !member) {
                 return res.send(false);
             }
-            countlyDb.collection('members').findOne({username: req.body.username}, function(err2, user) {
+            countlyDb.collection('members').findOne({username: req.body.username}, async function(err2, user) {
                 if (err) {
                     return res.send(false);
                 }

frontend/express/public/javascripts/countly/countly.total.users.js

@@ -1,4 +1,4 @@
-/* global countlyCommon, countlyDevice, _, jQuery */
+/* global countlyCommon, countlyGlobal, countlyDevice, _, jQuery */
 (function(countlyTotalUsers, $) {
 
     //Private Properties

plugins/reports/frontend/public/javascripts/countly.models.js

@@ -1,5 +1,6 @@
 /*global
     countlyCommon,
+    countlyGlobal,
     jQuery
  */
 (function(countlyReporting, $) {

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

@@ -319,7 +319,6 @@
             type: "POST",
             url: countlyCommon.API_PARTS.data.w + '/delete_view',
             data: {
-                "api_key": countlyGlobal.member.api_key,
                 "app_id": countlyCommon.ACTIVE_APP_ID,
                 "method": "delete_view",
                 "view_url": view