区域分数索引建立
Merge remote-tracking branch 'origin/master'

Conflicts:
	console/conf/application.conf