Merge branch 'dev'

diff --cc telecaster/tools/status.py
index f3b21e628a2f299b77b884beb954aaa4fd193c52,f82a3a3f72a730c3650d169643fa6d04aef90aa6..233b4fc5117be12e0ec7b240b9cdd3abb618ea63
--- 1/telecaster/tools/status.py
--- 2/telecaster/tools/status.py
+++ b/telecaster/tools/status.py
@@@ -39,18 -39,12 +39,19 @@@ import o
  from telecaster.tools import *
  from django.conf import settings
  
 +
 +interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2', 'eth3', 'eth4', 'eth5',
 +              'eth6', 'eth7', 'eth8', 'eth9', 'eno0', 'eno1', 'enp0s25',
 +              'wlan0', 'wlan1', 'wlan2', 'wlan3', 'wlan4']
 +
 +acpi_states = {0: 'battery', 1: 'battery', 2: 'AC'}
 +
 +
  class Status(object):
  
 -    interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2', 'eth3', 'eth4',
 -                  'wlan0', 'wlan1', 'wlan2', 'wlan3', 'wlan4', 'eno0',
 -                  'eno1',]
 +    interfaces = interfaces
 +    acpi_states = acpi_states
+     acpi_states = {0: 'battery', 1: 'battery', 2: 'AC'}
  
      def __init__(self):
          self.acpi = acpi.Acpi()