Merge pull request #248 from KettyLezama/master

Blah blah blah.
Changes to total budget display
Merge pull request #250 from sadasilva/master

Changes to total budget
Fields in UserManagementPanel