after merge, fixed columnname in dbManager -smd
fixed random shit in csproj file -smd
commit after merge -smd
stuff -smd
added user account dgv and some other shit -cmg to merge
more work on exports
merged shane and chris
merged chris and david