after merge, fixed columnname in dbManager -smd
fixed random shit in csproj file -smd
commit after merge -smd
stuff -smd
Added password reset and finished billing time exception tab
Added a login screen
Added exception handling for the server being down
Added a way to approve supply uses
added user account dgv and some other shit -cmg to merge
merged shane and chris
merged chris and david