commit by cb
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollegeDetails.aspx.cs
	UserControl/MiddleControl.ascx.cs
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 1aec3f30cb76ccc1e36162bb994fd6c2c4eed6a8.