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
more work on exports
merged shane and chris
merged chris and david
Worked on imports and exports for standalone mode
working on muli page pdfs
commit to work on davids pdf
New User panel changed and fully functional -smd
Pre-merge commit -smd
merged chris and shane
Merged with Chris, Edit User functioning correctly now -smd
Reworked PdfManager
partial merge
finished merge with david