Merge remote-tracking branch 'inventree/master'

InvenTree/InvenTree/forms.py

@@ -43,6 +43,7 @@ class EditUserForm(HelperForm):
     class Meta:
         model = User
         fields = [
+            'username',
             'first_name',
             'last_name',
             'email'

InvenTree/templates/InvenTree/settings/user.html

@@ -19,6 +19,10 @@
 </div>    
 
 <table class='table table-striped table-condensed'>
+    <tr>
+        <td>Username</td>
+        <td>{{ user.username }}</td>
+    </tr>
     <tr>
         <td>First Name</td>
         <td>{{ user.first_name }}</td>