Merge branch 'fix_critical_issues' into 'master'

changing uuid entry

See merge request !174

routes/account.ts

@@ -2,7 +2,6 @@ import fs from 'fs'
 import async from 'async'
 import bcrypt from 'bcryptjs'
 import * as passportSaml from 'passport-saml'
-import {v4 as uuidv4} from 'uuid';
 import dbconn from '../config/dbconn'
 import methods from '../functions/methods'
 import gitlab from '../functions/gitlab'
@@ -436,6 +435,7 @@ export = function (app:any, config:any, passport:any, lang:string) {
               if (!req.files) {
                 callback(null, newLogoFile)
               } else {
+                const uuidv4 = require('uuid/v4');
                 let fileName = uuidv4();
                 newLogoFile.mv(logoDir + fileName, function(err:any) {
                   newLogoFile = logoDir + fileName
@@ -532,6 +532,7 @@ export = function (app:any, config:any, passport:any, lang:string) {
                 callback(null, newLogoFile)
               } else {
                 newLogoFile = req.files.logo
+                const uuidv4 = require('uuid/v4');
                 let fileName = uuidv4();
                 newLogoFile.mv(logoDir + fileName, function(err:any) {
                   newLogoFile = logoDir + fileName