LoginDialog.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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
Merge pull request #251 from andy2013march/master

Added three new exceptions and four new edits