gfadf

ffdaafds
Revert "update master page"

This reverts commit f02ebca1b6b5c9876209631e3858504b46f78d5d.

Conflicts:
	Web.config
	ad/Category.aspx
	ad/Category.aspx.cs
Revert "Revert "update master page""

This reverts commit e594cd9e85b1103ee77a960f51829030d0123cd4.