Gui 845

mistakenly committed my change without setting up this branch. pulled changes from develop (including my change) into this branch, which is why it shows more updates. The real change here is in users.py