Delete Database2DataSet
Merge remote-tracking branch 'origin/Bill18' into Bill19

Conflicts:
	CIS411_Kris/frmAdmin.Designer.cs