'
after merge, fixed columnname in dbManager -smd
Billing add supply and log buttons work
a bunch of shit
fixed standalone mode checkbox
Merge branch 'david' of https://github.com/cmg5217/CUIT2 into david
Merge branch 'david' into merge2
merged chris and david
merged shane into merge
fixed random shit in csproj file -smd
commit after merge -smd
stuff -smd
added user account dgv and some other shit -cmg to merge