just commit
Merge branches 'master', 'master' and 'master' of https://github.com/hbb20/gtu_pde

Conflicts:
	App_Code/ApplicantClass.cs
	App_Code/CollegeClass.cs
	App_Code/DepartmentClass.cs
	App_Code/InventorClass.cs
	App_Code/PDEFormClass.cs
	App_Code/ProjectTeamClass.cs
	App_Code/StudentClass.cs
	App_Code/TeamClass.cs
	App_Code/UserClass.cs
	Site2.Master