Merge branch 'feature/eta1.1.0_edb_classify' into debug

# Conflicts:
#	controllers/data_manage/edb_info_calculate.go
#	models/data_manage/edb_info.go