Merge branch 'master' into develop

# Conflicts:
#	requirements.txt
#	setup.py

Author: ajdini

app/api/models/LXCContainer.py

@@ -45,7 +45,6 @@ def __init__(self, input):
         if input.get('imageAlias'):
             self.setImageAlias(input.get('imageAlias'))
 
-        super(LXCContainer, self).__init__(remoteHost=self.remoteHost)
         if input.get('autostart') != None:
             self.setBootType(input.get('autostart'))
         else:

lxdui.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Web UI for the native Linux container technology LXD/LXC
+After=network.target snapd.service
+Requires=snapd.service
+
+[Service]
+Type=simple
+PIDFile=/run/lxdui/lxdui.pid
+ExecStart=/usr/local/bin/lxdui start
+ExecStop=/usr/local/bin/lxdui stop
+
+[Install]
+WantedBy=multi-user.target

requirements.txt

@@ -3,11 +3,11 @@ Flask==1.0.2
 flask-login==0.4.1
 flask_jwt==0.3.2
 jsonschema==2.6.0
-requests==2.9.1
+requests==2.20.0
 netaddr==0.7.19
 pyopenssl==17.5.0
-psutil==5.4.5
-pylxd==2.2.7
+psutil==5.6.6
+pylxd==2.2.10
 terminado==0.8.1
 tornado==5.0.2
 tornado-xstatic

setup.py

@@ -33,10 +33,10 @@
        'flask-login==0.4.1',
        'flask_jwt==0.3.2',
        'jsonschema==2.6.0',
-       'requests==2.9.1',
+       'requests==2.20.0',
        'netaddr==0.7.19',
        'pyopenssl==17.5.0',
-       'psutil==5.4.5',
+       'psutil==5.6.6',
        'pylxd==2.2.7',
        'terminado==0.8.1',
        'tornado==5.0.2',