20141014 ghz 修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	templets/default/list_article_remen.htm