aa
Merge branch 'master' of https://github.com/xfzxqingdao2014/QingDao_xfzx

Conflicts:
	qdweb/UserLogin.aspx
	qdweb/UserLogin.aspx.cs
	qdweb/UserLoginAction.aspx.cs
	qdweb/information/Index.aspx
	qdweb/information/NewsDetail.aspx
	qdweb/information/NewsList.aspx
	qdweb/information/PatentSearch.aspx