Fixed some bugs
Merge branch 'master' of github.com:cainianhua/YiJing

Conflicts:
	YiJingWebUI/UserControls/Footer.ascx
冲突