地域新算法排序
no message
Merge remote-tracking branch 'Nicexm/master'

Conflicts:
	catalog/view/theme/default/template/common/footer.tpl
	forum/view/footer.htm
no message
版块图标根据名字更改
no message
Merge pull request #29 from Luobata/master

。