Merge remote-tracking branch 'origin/develop'

Author: snipe

app/controllers/admin/UsersController.php

@@ -309,6 +309,11 @@ public function postEdit($id = null)
                 $user->password = $password;
             }
 
+            // Do we want to update the user email?
+            if (!Config::get('app.lock_passwords')) {
+                $user->email		    = Input::get('email');
+            }
+
             // Get the current user groups
             $userGroups = $user->groups()->lists('group_id', 'group_id');